From 6319f64a399d1b268f19c7b86ebd4f4f9dda0b82 Mon Sep 17 00:00:00 2001 From: Dallas Richmond Date: Fri, 18 Oct 2024 11:01:19 -0700 Subject: [PATCH] Uncommented backend and frontend --- .github/workflows/.deploy.yml | 70 +++++++++++++++++------------------ .github/workflows/pr-open.yml | 3 +- common/openshift.init.yml | 2 +- 3 files changed, 37 insertions(+), 38 deletions(-) diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml index 1ad7742..a5ef058 100644 --- a/.github/workflows/.deploy.yml +++ b/.github/workflows/.deploy.yml @@ -57,39 +57,39 @@ jobs: -p TAG=${{ inputs.tag }} -p TARGET=${{ inputs.target }} - # backend: - # name: Backend - # needs: [database] - # environment: ${{ inputs.environment }} - # runs-on: ubuntu-22.04 - # steps: - # - name: Deploy Backend - # uses: bcgov-nr/action-deployer-openshift@v3.0.1 - # with: - # oc_namespace: ${{ vars.OC_NAMESPACE }} - # oc_server: ${{ vars.OC_SERVER }} - # oc_token: ${{ secrets.OC_TOKEN }} - # file: backend/openshift.deploy.yml - # overwrite: true - # parameters: - # -p TAG=${{ inputs.tag }} -p TARGET=${{ inputs.target }} - # verification_path: /api/health - # verification_retry_attempts: "5" - # verification_retry_seconds: "15" + backend: + name: Backend + needs: [init, database] + environment: ${{ inputs.environment }} + runs-on: ubuntu-22.04 + steps: + - name: Deploy Backend + uses: bcgov-nr/action-deployer-openshift@v3.0.1 + with: + oc_namespace: ${{ vars.OC_NAMESPACE }} + oc_server: ${{ vars.OC_SERVER }} + oc_token: ${{ secrets.OC_TOKEN }} + file: backend/openshift.deploy.yml + overwrite: true + parameters: + -p TAG=${{ inputs.tag }} -p TARGET=${{ inputs.target }} + verification_path: /api/health + verification_retry_attempts: "5" + verification_retry_seconds: "15" - # frontend: - # name: Frontend - # # needs: [backend] - # environment: ${{ inputs.environment }} - # runs-on: ubuntu-22.04 - # steps: - # - name: Deploy Frontend - # uses: bcgov-nr/action-deployer-openshift@v3.0.1 - # with: - # oc_namespace: ${{ vars.OC_NAMESPACE }} - # oc_server: ${{ vars.OC_SERVER }} - # oc_token: ${{ secrets.OC_TOKEN }} - # file: frontend/openshift.deploy.yml - # overwrite: true - # parameters: - # -p TAG=${{ inputs.tag }} -p TARGET=${{ inputs.target }} + frontend: + name: Frontend + needs: [init, database, backend] + environment: ${{ inputs.environment }} + runs-on: ubuntu-22.04 + steps: + - name: Deploy Frontend + uses: bcgov-nr/action-deployer-openshift@v3.0.1 + with: + oc_namespace: ${{ vars.OC_NAMESPACE }} + oc_server: ${{ vars.OC_SERVER }} + oc_token: ${{ secrets.OC_TOKEN }} + file: frontend/openshift.deploy.yml + overwrite: true + parameters: + -p TAG=${{ inputs.tag }} -p TARGET=${{ inputs.target }} diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml index 6741a71..e7537cf 100644 --- a/.github/workflows/pr-open.yml +++ b/.github/workflows/pr-open.yml @@ -15,8 +15,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - # package: [database, backend, frontend] - package: [database] + package: [database, backend, frontend] timeout-minutes: 20 steps: - uses: bcgov-nr/action-builder-ghcr@v2.2.0 diff --git a/common/openshift.init.yml b/common/openshift.init.yml index 505bfc2..c9303be 100644 --- a/common/openshift.init.yml +++ b/common/openshift.init.yml @@ -11,7 +11,7 @@ parameters: required: true - name: DB_PORT required: true -object: +objects: - apiVersion: v1 kind: Secret metadata: