diff --git a/.github/workflows/docker_img.yml b/.github/workflows/docker_img.yml index 3366bae8a3fcb7db4160d5c103970f0ae56d39e2..1b9c4cb855cec9b9141914b150e03391aadefefb 100644 --- a/.github/workflows/docker_img.yml +++ b/.github/workflows/docker_img.yml @@ -126,14 +126,34 @@ jobs: echo "OKD_SECRET=${{ secrets.OKD_PROD_SECRET }}" >> $GITHUB_ENV echo "OKD_PROJECT=interactive-viewer" >> $GITHUB_ENV echo "ROUTE_HOST=siibra-explorer.apps.hbp.eu" >> $GITHUB_ENV - echo "Deploy on prod cluster..." + + if [[ "$BRANCH_NAME" == 'master' ]] + then + FULL_DEPLOY_ID=siibra-explorer-branch-deploy-2-prodpathviewer + FULL_DEPLOY_ID2=siibra-explorer-branch-deploy-2-iav-legacy + echo "FULL_DEPLOY_ID=$FULL_DEPLOY_ID" >> $GITHUB_ENV + echo "FULL_DEPLOY_ID2=$FULL_DEPLOY_ID2" >> $GITHUB_ENV + else + FULL_DEPLOY_ID=siibra-explorer-branch-deploy-2-stagingpathed + echo "FULL_DEPLOY_ID=$FULL_DEPLOY_ID" >> $GITHUB_ENV + fi + + echo "Deploy on **prod** cluster..." + echo "Deploy id: **${FULL_DEPLOY_ID}** ..." + if [ ! -z "$FULL_DEPLOY_ID2" ] + then + echo "Secondary deploy id: **$FULL_DEPLOY_ID2** ..." + fi else echo "OKD_URL=https://okd-dev.hbp.eu:443" >> $GITHUB_ENV echo "OKD_SECRET=${{ secrets.OKD_DEV_SECRET }}" >> $GITHUB_ENV echo "OKD_PROJECT=interactive-atlas-viewer" >> $GITHUB_ENV echo "ROUTE_HOST=siibra-explorer.apps-dev.hbp.eu" >> $GITHUB_ENV echo "BUILD_TEXT=$BRANCH_NAME" >> $GITHUB_ENV - echo "Deploy on dev cluster..." + FULL_DEPLOY_ID=${{ env.OC_TEMPLATE_NAME }}-$DEPLOY_ID + echo "FULL_DEPLOY_ID=$FULL_DEPLOY_ID" >> $GITHUB_ENV + echo "Deploy on **dev** cluster ..." + echo "Deploy id: **${FULL_DEPLOY_ID}** ..." fi - name: 'Login via oc cli & deploy' run: | @@ -150,13 +170,14 @@ jobs: echo "Working branch name: $BRANCH_NAME, deploy_id: $DEPLOY_ID" # check if the deploy already exist - if oc get dc ${{ env.OC_TEMPLATE_NAME }}-$DEPLOY_ID; then + + if oc get dc $FULL_DEPLOY_ID; then # trigger redeploy if deployconfig exists already - echo "dc ${{ env.OC_TEMPLATE_NAME }}-$DEPLOY_ID already exist, redeploy..." - oc rollout latest dc/${{ env.OC_TEMPLATE_NAME }}-$DEPLOY_ID + echo "dc $FULL_DEPLOY_ID already exist, redeploy..." + oc rollout latest dc/$FULL_DEPLOY_ID else # create new app if deployconfig does not yet exist - echo "dc ${{ env.OC_TEMPLATE_NAME }}-$DEPLOY_ID does not yet exist, create new app..." + echo "dc $FULL_DEPLOY_ID does not yet exist, create new app..." oc new-app --template ${{ env.OC_TEMPLATE_NAME }} \ -p BRANCH_NAME=$BRANCH_NAME \ -p DEPLOY_ID=$DEPLOY_ID \ @@ -164,6 +185,13 @@ jobs: -p ROUTE_PATH=$ROUTE_PATH \ -p BUILD_TEXT=$BUILD_TEXT fi + + if [ ! -z "$FULL_DEPLOY_ID2" ] + then + echo "FULL_DEPLOY_ID2 is defined, trying to redeploy $FULL_DEPLOY_ID2 ..." + oc rollout latest dc/$FULL_DEPLOY_ID2 + fi + - name: 'Update status badge' if: success() run: | diff --git a/.openshift/v2/okd_branch_tmpl_v2.yaml b/.openshift/v2/okd_branch_tmpl_v2.yaml index 3c95ec2f701e87531bb089d0c7e47c1bc020a08a..2524636a1200dd685aa0221cce117ba66fb85e19 100644 --- a/.openshift/v2/okd_branch_tmpl_v2.yaml +++ b/.openshift/v2/okd_branch_tmpl_v2.yaml @@ -48,6 +48,8 @@ objects: name: plugins - configMapRef: name: other-deploy-config + - configMapRef: + name: obj-storage-cred image: "docker-registry.ebrains.eu/siibra/siibra-explorer:${BRANCH_NAME}" imagePullPolicy: Always