diff --git a/.cloudbuild/bluegreen-update.sh b/.cloudbuild/bluegreen-update.sh index 418105ed8..c4908f275 100644 --- a/.cloudbuild/bluegreen-update.sh +++ b/.cloudbuild/bluegreen-update.sh @@ -26,7 +26,7 @@ chmod 400 /root/.ssh/id_rsa ssh-keyscan -t rsa github.com > /root/.ssh/known_hosts git clone git@github.com:broadinstitute/gnomad-deployments.git -cd gnomad-deployments/browser-test +cd gnomad-deployments/gnomad-browser INTENDED_DEPLOYMENT=$(yq '.spec.selector.deployment' < prod-deflector/gnomad-bluegreen.service.yaml) @@ -56,8 +56,8 @@ echo "target/inactive deployment is $TARGET_DEPLOYMENT" # Update image tags in the inactive deployment and push #### pushd $TARGET_DEPLOYMENT -kustomize --stack-trace edit set image "gnomad-api-nginx=${REPO_PROJECT}/nginx:${DOCKER_TAG}" -kustomize --stack-trace edit set image "gnomad-browser-nginx=${REPO_PROJECT}/nginx:${DOCKER_TAG}" +kustomize --stack-trace edit set image "gnomad-api=us-docker.pkg.dev/${REPO_PROJECT}/gnomad/gnomad-api:${DOCKER_TAG}" +kustomize --stack-trace edit set image "gnomad-browser-us-docker.pkg.dev/${REPO_PROJECT}/gnomad/gnomad-browser:${DOCKER_TAG}" popd git add $TARGET_DEPLOYMENT diff --git a/.cloudbuild/rev-browser-bluegreen.yaml b/.cloudbuild/rev-browser-bluegreen.yaml index 94323512d..1bc487b43 100644 --- a/.cloudbuild/rev-browser-bluegreen.yaml +++ b/.cloudbuild/rev-browser-bluegreen.yaml @@ -1,11 +1,45 @@ steps: - - name: 'us-docker.pkg.dev/${PROJECT_ID}/gnomad/tgg-deploykit:testing-4' + - name: 'gcr.io/cloud-builders/docker' + args: + [ + 'build', + '-t', + 'us-docker.pkg.dev/${PROJECT_ID}/gnomad/gnomad-api:$SHORT_SHA', + '-t', + 'us-docker.pkg.dev/${PROJECT_ID}/gnomad/gnomad-api:${_BUILD_TAG}', + '-f', + 'deploy/dockerfiles/browser/api.dockerfile', + '.', + ] + - name: 'gcr.io/cloud-builders/docker' + args: ['push', 'us-docker.pkg.dev/${PROJECT_ID}/gnomad/gnomad-api:$SHORT_SHA'] + - name: 'gcr.io/cloud-builders/docker' + args: ['push', 'us-docker.pkg.dev/${PROJECT_ID}/gnomad/gnomad-api:${_BUILD_TAG}'] + + - name: 'gcr.io/cloud-builders/docker' + args: + [ + 'build', + '-t', + 'us-docker.pkg.dev/${PROJECT_ID}/gnomad/gnomad-browser:$SHORT_SHA', + '-t', + 'us-docker.pkg.dev/${PROJECT_ID}/gnomad/gnomad-browser:${_BUILD_TAG}', + '-f', + 'deploy/dockerfiles/browser/browser.dockerfile', + '.', + ] + - name: 'gcr.io/cloud-builders/docker' + args: ['push', 'us-docker.pkg.dev/${PROJECT_ID}/gnomad/gnomad-browser:$SHORT_SHA'] + - name: 'gcr.io/cloud-builders/docker' + args: ['push', 'us-docker.pkg.dev/${PROJECT_ID}/gnomad/gnomad-browser:${_BUILD_TAG}'] + + - name: 'us-docker.pkg.dev/${PROJECT_ID}/gnomad/tgg-deploykit:1.0.0' entrypoint: 'bash' args: ['./bluegreen-update.sh'] dir: '.cloudbuild' env: - - 'CLOUDSDK_COMPUTE_ZONE=us-central1-b' - - 'CLOUDSDK_CONTAINER_CLUSTER=gnomad-sj' + - 'CLOUDSDK_COMPUTE_ZONE=us-east1-b' + - 'CLOUDSDK_CONTAINER_CLUSTER=gnomad-v4' - 'REPO_PROJECT=$PROJECT_ID' - 'DOCKER_TAG=$SHORT_SHA' secretEnv: @@ -14,3 +48,7 @@ availableSecrets: secretManager: - versionName: projects/$PROJECT_ID/secrets/GITHUB_DEPLOY_KEY/versions/latest env: 'DEPLOY_KEY' +options: + dynamicSubstitutions: true +substitutions: + _BUILD_TAG: '${_BRANCH_FOR_IMAGE_NAME}-${BUILD_ID}'