Merge pull request #744 from bcgov/feat/ci-cd-fix

Feat/ci cd fix
bcgov · Jan 23, 2025 · 350d3f1 · 350d3f1
2 parents d62be92 + 80843a0
commit 350d3f1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 19 deletions.
diff --git a/.github/workflows/_build.yml b/.github/workflows/_build.yml
@@ -161,14 +161,14 @@ jobs:
           cache-to: type=gha,mode=max
           file: ./backend/applications/Dockerfile-migrations-openshift
 
-      - name: Build and push Migration image for Sites
-        if: steps.check.outputs.build == 'true' && inputs.component == 'backend/sites'
-        uses: docker/[email protected]
-        with:
-            context: ./${{ inputs.component }}/
-            push: true
-            tags: ghcr.io/${{ github.repository }}/backend/sites-migration:${{ inputs.img_build }}
-            cache-from: type=gha
-            cache-to: type=gha,mode=max
-            file: ./backend/sites/Dockerfile-migrations-openshift
+      # - name: Build and push Migration image for Sites
+      #   if: steps.check.outputs.build == 'true' && inputs.component == 'backend/sites'
+      #   uses: docker/[email protected]
+      #   with:
+      #       context: ./${{ inputs.component }}/
+      #       push: true
+      #       tags: ghcr.io/${{ github.repository }}/backend/sites-migration:${{ inputs.img_build }}
+      #       cache-from: type=gha
+      #       cache-to: type=gha,mode=max
+      #       file: ./backend/sites/Dockerfile-migrations-openshift
 
diff --git a/.github/workflows/ci-cd-openshift-dev.yaml b/.github/workflows/ci-cd-openshift-dev.yaml
@@ -22,7 +22,7 @@ jobs:
     uses: ./.github/workflows/_build.yml
     strategy:
       matrix:
-        component: [backend/applications, backend/gateway, backend/legacy, backend/users, backend/sites, frontend]
+        component: [backend/applications, backend/gateway, backend/legacy, backend/users, frontend]
         include:
           - component: backend/applications
             triggers: ('backend/applications/')
@@ -32,8 +32,6 @@ jobs:
             triggers: ('backend/legacy/')
           - component: backend/users
             triggers:  ('backend/users/')
-          - component: backend/sites
-            triggers:  ('backend/sites/')
           - component: frontend
             triggers: ('frontend/')
     secrets:
@@ -50,7 +48,7 @@ jobs:
     uses: ./.github/workflows/_code-cov.yml
     strategy:
       matrix:
-        component: [backend/applications, backend/gateway, backend/users, backend/sites, frontend]
+        component: [backend/applications, backend/gateway, backend/users, frontend]
     secrets:
       gh_token: ${{ secrets.GITHUB_TOKEN }}
     with:
@@ -68,7 +66,7 @@ jobs:
     uses: ./.github/workflows/_deploy.yml
     strategy:
       matrix:
-        component: [backend/applications, backend/gateway, backend/legacy, backend/users, backend/sites, database, frontend]
+        component: [backend/applications, backend/gateway, backend/legacy, backend/users, database, frontend]
         include:
           - component: database
             overwrite: false
@@ -90,10 +88,6 @@ jobs:
             overwrite: true
             template_file: .github/openshift/deploy.backend-users.yml
             template_vars: -p PROMOTE=${{ github.repository }}/backend/users -p CONTAINER_PORT=4005 -p ENV=dev -p IMAGE_TAG=dev  
-          - component: backend/sites
-            overwrite: true
-            template_file: .github/openshift/deploy.backend-sites.yml
-            template_vars: -p PROMOTE=${{ github.repository }}/backend/sites -p CONTAINER_PORT=4007 -p ENV=dev -p IMAGE_TAG=dev 
           - component: frontend
             overwrite: true
             template_file: .github/openshift/deploy.frontend.yml