From 42fba17edb0b89ca6c3e575b67c7fd83888cf23c Mon Sep 17 00:00:00 2001 From: Theo Ilie Date: Wed, 7 Feb 2024 10:03:33 -0800 Subject: [PATCH 1/2] Integrate ddex into CI auto-upgrade --- .circleci/config.yml | 1 + .circleci/src/@continue_config.yml | 3 ++ ...ommit-audius-docker-compose-and-notify.yml | 1 + .circleci/src/jobs/deploy-stage-nodes.yml | 2 +- .circleci/src/workflows/ddex-stage.yml | 34 +++++++++++++++++++ 5 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 .circleci/src/workflows/ddex-stage.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index 95f85accb9a..f7f958bddd6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -519,6 +519,7 @@ workflows: .* run-stems-workflow true .* run-harmony-workflow true .* run-probers-workflow true + .* run-ddex-stage-workflow true .circleci/.* run-web-workflow true .circleci/.* run-mobile-workflow true packages/common/.* run-common-workflow true diff --git a/.circleci/src/@continue_config.yml b/.circleci/src/@continue_config.yml index 890ceaad8bb..f0b976c9590 100644 --- a/.circleci/src/@continue_config.yml +++ b/.circleci/src/@continue_config.yml @@ -76,6 +76,9 @@ parameters: run-ddex-publisher-workflow: type: boolean default: false + run-ddex-stage-workflow: + type: boolean + default: false # Can enable recurring probers against stage at some point # workflows: # version: 2.1 diff --git a/.circleci/src/jobs/commit-audius-docker-compose-and-notify.yml b/.circleci/src/jobs/commit-audius-docker-compose-and-notify.yml index 7d0a411d3a1..ed5e6a7b685 100644 --- a/.circleci/src/jobs/commit-audius-docker-compose-and-notify.yml +++ b/.circleci/src/jobs/commit-audius-docker-compose-and-notify.yml @@ -117,6 +117,7 @@ steps: sed -i "s/\({TAG:-\)[^}]*\}/\1$CIRCLE_SHA1}/" creator-node/docker-compose*.yml sed -i "s/\({TAG:-\)[^}]*\}/\1$CIRCLE_SHA1}/" discovery-provider/docker-compose*.yml sed -i "s/\({TAG:-\)[^}]*\}/\1$CIRCLE_SHA1}/" identity-service/docker-compose*.yml + sed -i "s/\({TAG:-\)[^}]*\}/\1$CIRCLE_SHA1}/" ddex/docker-compose*.yml git add */docker-compose*.yml git commit -m "$CIRCLE_BRANCH auto-deploy" git push origin stage diff --git a/.circleci/src/jobs/deploy-stage-nodes.yml b/.circleci/src/jobs/deploy-stage-nodes.yml index 9de29904106..dab83d2eb5f 100644 --- a/.circleci/src/jobs/deploy-stage-nodes.yml +++ b/.circleci/src/jobs/deploy-stage-nodes.yml @@ -1,6 +1,6 @@ parameters: service: - description: 'Service to deploy (creator-node, discovery-provider, identity-service)' + description: 'Service to deploy (creator-node, discovery-provider, identity-service, ddex)' type: string resource_class: small docker: diff --git a/.circleci/src/workflows/ddex-stage.yml b/.circleci/src/workflows/ddex-stage.yml new file mode 100644 index 00000000000..4b228a80d85 --- /dev/null +++ b/.circleci/src/workflows/ddex-stage.yml @@ -0,0 +1,34 @@ +when: << pipeline.parameters.run-ddex-stage-workflow >> +jobs: + - push-docker-image: + name: push-ddex-web + context: [Vercel, dockerhub] + service: ddex-web + filters: + branches: + only: main + - push-docker-image: + name: push-ddex-ingester + context: [Vercel, dockerhub] + service: ddex-ingester + filters: + branches: + only: main + - push-docker-image: + name: push-ddex-publisher + context: [Vercel, dockerhub] + service: ddex-publisher + filters: + branches: + only: main + - deploy-stage-nodes: + name: deploy-stage-ddex + requires: + - push-ddex-web + - push-ddex-ingester + - push-ddex-publisher + filters: + branches: + only: main + context: github + service: ddex From 3865f1c24a51daea6da52ec7b83e19414eb4c683 Mon Sep 17 00:00:00 2001 From: Theo Ilie Date: Wed, 7 Feb 2024 10:08:31 -0800 Subject: [PATCH 2/2] Fix indent --- .circleci/src/workflows/ddex-stage.yml | 36 +++++++++++++------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.circleci/src/workflows/ddex-stage.yml b/.circleci/src/workflows/ddex-stage.yml index 4b228a80d85..a77f91c5632 100644 --- a/.circleci/src/workflows/ddex-stage.yml +++ b/.circleci/src/workflows/ddex-stage.yml @@ -1,26 +1,26 @@ when: << pipeline.parameters.run-ddex-stage-workflow >> jobs: - push-docker-image: - name: push-ddex-web - context: [Vercel, dockerhub] - service: ddex-web - filters: - branches: - only: main + name: push-ddex-web + context: [Vercel, dockerhub] + service: ddex-web + filters: + branches: + only: main - push-docker-image: - name: push-ddex-ingester - context: [Vercel, dockerhub] - service: ddex-ingester - filters: - branches: - only: main + name: push-ddex-ingester + context: [Vercel, dockerhub] + service: ddex-ingester + filters: + branches: + only: main - push-docker-image: - name: push-ddex-publisher - context: [Vercel, dockerhub] - service: ddex-publisher - filters: - branches: - only: main + name: push-ddex-publisher + context: [Vercel, dockerhub] + service: ddex-publisher + filters: + branches: + only: main - deploy-stage-nodes: name: deploy-stage-ddex requires: