uncomment lower environment deployments and git tagging

Author: SoLetsDev

.github/workflows/deploy-to-test.yaml

@@ -45,12 +45,12 @@ jobs:
           #grabs the image sha for our input environments using jq
           API_IMAGE_SHA=$(oc get is api -o json | jq -r '.spec.tags[] | select(.name == "${{env.APP_ENVIRONMENT_SOURCE}}").from.name')
           REGISTRY_PORTAL_IMAGE_SHA=$(oc get is registry-portal -o json | jq -r '.spec.tags[] | select(.name == "${{env.APP_ENVIRONMENT_SOURCE}}").from.name')
-          # PSP_PORTAL_IMAGE_SHA=$(oc get is psp-portal -o json | jq -r '.spec.tags[] | select(.name == "${{inputs.app_environment_source}}").from.name')
+          PSP_PORTAL_IMAGE_SHA=$(oc get is psp-portal -o json | jq -r '.spec.tags[] | select(.name == "${{inputs.app_environment_source}}").from.name')
 
           echo registry-portal image sha being promoted: $REGISTRY_PORTAL_IMAGE_SHA
           echo api image sha being promoted: $API_IMAGE_SHA
-          # echo psp-portal image sha being promoted: $PSP_PORTAL_IMAGE_SHA
+          echo psp-portal image sha being promoted: $PSP_PORTAL_IMAGE_SHA
 
           oc tag -n ${{env.OPENSHIFT_NAMESPACE}} registry-portal:${{env.APP_ENVIRONMENT_SOURCE}} registry-portal:${{env.APP_ENVIRONMENT_DESTINATION}}
           oc tag -n ${{env.OPENSHIFT_NAMESPACE}} api:${{env.APP_ENVIRONMENT_SOURCE}} api:${{env.APP_ENVIRONMENT_DESTINATION}}
-          # oc tag -n ${{env.OPENSHIFT_NAMESPACE}} psp-portal:${{env.APP_ENVIRONMENT_SOURCE}} psp-portal:${{env.APP_ENVIRONMENT_DESTINATION}}
+          oc tag -n ${{env.OPENSHIFT_NAMESPACE}} psp-portal:${{env.APP_ENVIRONMENT_SOURCE}} psp-portal:${{env.APP_ENVIRONMENT_DESTINATION}}

.github/workflows/deploy-to-uat.yaml

@@ -45,12 +45,12 @@ jobs:
           #grabs the image sha for our input environments using jq
           API_IMAGE_SHA=$(oc get is api -o json | jq -r '.spec.tags[] | select(.name == "${{env.APP_ENVIRONMENT_SOURCE}}").from.name')
           REGISTRY_PORTAL_IMAGE_SHA=$(oc get is registry-portal -o json | jq -r '.spec.tags[] | select(.name == "${{env.APP_ENVIRONMENT_SOURCE}}").from.name')
-          # PSP_PORTAL_IMAGE_SHA=$(oc get is psp-portal -o json | jq -r '.spec.tags[] | select(.name == "${{env.APP_ENVIRONMENT_SOURCE}}").from.name')
+          PSP_PORTAL_IMAGE_SHA=$(oc get is psp-portal -o json | jq -r '.spec.tags[] | select(.name == "${{env.APP_ENVIRONMENT_SOURCE}}").from.name')
 
           echo registry-portal image sha being promoted: $REGISTRY_PORTAL_IMAGE_SHA
           echo api image sha being promoted: $API_IMAGE_SHA
-          # echo psp-portal image sha being promoted: $PSP_PORTAL_IMAGE_SHA
+          echo psp-portal image sha being promoted: $PSP_PORTAL_IMAGE_SHA
 
           oc tag -n ${{env.OPENSHIFT_NAMESPACE}} registry-portal:${{env.APP_ENVIRONMENT_SOURCE}} registry-portal:${{env.APP_ENVIRONMENT_DESTINATION}}
           oc tag -n ${{env.OPENSHIFT_NAMESPACE}} api:${{env.APP_ENVIRONMENT_SOURCE}} api:${{env.APP_ENVIRONMENT_DESTINATION}}
-          # oc tag -n ${{env.OPENSHIFT_NAMESPACE}} psp-portal:${{env.APP_ENVIRONMENT_SOURCE}} psp-portal:${{env.APP_ENVIRONMENT_DESTINATION}}
+          oc tag -n ${{env.OPENSHIFT_NAMESPACE}} psp-portal:${{env.APP_ENVIRONMENT_SOURCE}} psp-portal:${{env.APP_ENVIRONMENT_DESTINATION}}

.github/workflows/tag-create.git.and.imagestream.tag.yaml

@@ -96,32 +96,33 @@ jobs:
       REGISTRY_USER: ${{ secrets.DOCKER_USERNAME }}
       REGISTRY_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
-  # build-psp-portal:
-  #   needs: validate-input
-  #   permissions:
-  #     contents: read
-  #     packages: write
-  #     id-token: write
-  #     security-events: write
-  #   uses: ./.github/workflows/build-template.yml
-  #   with:
-  #     IMAGE_CONTEXT: src
-  #     IMAGE_FILE: src/psp-portal.Dockerfile
-  #     IMAGE_NAME: psp-portal
-  #     REGISTRY: ${{ vars.DOCKER_REGISTRY }}
-  #   secrets:
-  #     REGISTRY_USER: ${{ secrets.DOCKER_USERNAME }}
-  #     REGISTRY_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+  build-psp-portal:
+    needs: validate-input
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+      security-events: write
+    uses: ./.github/workflows/build-template.yml
+    with:
+      IMAGE_CONTEXT: src
+      IMAGE_FILE: src/psp-portal.Dockerfile
+      IMAGE_NAME: psp-portal
+      REGISTRY: ${{ vars.DOCKER_REGISTRY }}
+    secrets:
+      REGISTRY_USER: ${{ secrets.DOCKER_USERNAME }}
+      REGISTRY_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
   git-tag:
     name: Tag image
     runs-on: ubuntu-22.04
-    needs: [
+    needs:
+      [
         validate-input,
         build-api,
         build-registry-portal,
         build-e2e-test-data,
-        # build-psp-portal,
+        build-psp-portal,
       ]
     environment: dev