diff --git a/azure-pipelines-staging.yml b/azure-pipelines-staging.yml index dcf3ee1..680af03 100644 --- a/azure-pipelines-staging.yml +++ b/azure-pipelines-staging.yml @@ -27,35 +27,33 @@ jobs: exit 1 fi displayName: 'タグが付けられたCommitがmainブランチに存在するか確認' -# - job: backend_test -# dependsOn: initialize -# condition: succeeded('initialize') -# displayName: UnitTest -# pool: -# vmImage: ubuntu-latest -# steps: -# - checkout: self -# clean: true -# fetchDepth: 1 -# - task: Bash@3 -# displayName: Bash Script (Test) -# inputs: -# targetType: inline -# workingDirectory: dictation_server/.devcontainer -# script: | -# sudo curl -L "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose -# sudo chmod +x /usr/local/bin/docker-compose -# docker-compose --version -# docker-compose -f pipeline-docker-compose.yml build -# docker-compose -f pipeline-docker-compose.yml up -d -# docker-compose exec -T dictation_server sudo npm ci -# docker-compose exec -T dictation_server sudo npm run migrate:up:test -# docker-compose exec -T dictation_server sudo npm run test -- job: backend_build +- job: backend_test dependsOn: initialize condition: succeeded('initialize') - # dependsOn: backend_test - # condition: succeeded('backend_test') + displayName: UnitTest + pool: + vmImage: ubuntu-latest + steps: + - checkout: self + clean: true + fetchDepth: 1 + - task: Bash@3 + displayName: Bash Script (Test) + inputs: + targetType: inline + workingDirectory: dictation_server/.devcontainer + script: | + sudo curl -L "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose + sudo chmod +x /usr/local/bin/docker-compose + docker-compose --version + docker-compose -f pipeline-docker-compose.yml build + docker-compose -f pipeline-docker-compose.yml up -d + docker-compose exec -T dictation_server sudo npm ci + docker-compose exec -T dictation_server sudo npm run migrate:up:test + docker-compose exec -T dictation_server sudo npm run test +- job: backend_build + dependsOn: backend_test + condition: succeeded('backend_test') displayName: Build And Push Backend Image pool: name: odms-deploy-pipeline @@ -191,6 +189,9 @@ jobs: targetType: inline workingDirectory: dictation_function/.devcontainer script: | + sudo curl -L "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose + sudo chmod +x /usr/local/bin/docker-compose + docker-compose --version docker-compose -f pipeline-docker-compose.yml build docker-compose -f pipeline-docker-compose.yml up -d docker-compose exec -T dictation_function sudo npm ci