From 34b530cb863c041681fa32b98f3be132c98f5bcc Mon Sep 17 00:00:00 2001 From: Paulo Gomes da Cruz Junior Date: Fri, 6 Jan 2023 13:08:32 -0800 Subject: [PATCH] fix: fixing deploy to main (#233) * fix: fixing deploy to main * ci: updating merge to mai deploy * Update deployer action to v1.0.0 * Update deployer action params Co-authored-by: Derek Roberts --- .github/workflows/merge-main.yml | 28 ++++++++++------------------ .github/workflows/pr-open.yml | 23 +++++++++++------------ 2 files changed, 21 insertions(+), 30 deletions(-) diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml index 8b2a87bb82..3373db5725 100644 --- a/.github/workflows/merge-main.yml +++ b/.github/workflows/merge-main.yml @@ -63,7 +63,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Deploys - uses: bcgov-nr/action-deployer-openshift@v0.1.0 + uses: bcgov-nr/action-deployer-openshift@v1.0.0 with: file: common/openshift.init.yml oc_namespace: ${{ secrets.OC_NAMESPACE }} @@ -83,7 +83,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Deploys - uses: bcgov-nr/action-deployer-openshift@v0.1.0 + uses: bcgov-nr/action-deployer-openshift@v1.0.0 with: file: database/openshift.deploy.yml oc_namespace: ${{ secrets.OC_NAMESPACE }} @@ -105,7 +105,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Deploys - uses: bcgov-nr/action-deployer-openshift@v0.1.0 + uses: bcgov-nr/action-deployer-openshift@v1.0.0 with: file: backend/openshift.deploy.yml oc_namespace: ${{ secrets.OC_NAMESPACE }} @@ -113,6 +113,7 @@ jobs: oc_token: ${{ secrets.OC_TOKEN }} overwrite: true penetration_test: false + verification_path: health parameters: -p ZONE=${{ env.ZONE }} -p NAME=${{ github.event.repository.name }} -p PROMOTE=${{ github.repository }}/backend:${{ env.ZONE }} @@ -123,11 +124,6 @@ jobs: -p CHES_CLIENT_SECRET=${{ secrets.CHES_CLIENT_SECRET }} -p CHES_TOKEN_URL='https://test.loginproxy.gov.bc.ca/auth/realms/comsvcauth/protocol/openid-connect/token' -p CHES_API_URL='https://ches-test.api.gov.bc.ca/api/v1' - -p ORACLEDB_USER=${{ secrets.ORACLEDB_USER }} - -p ORACLEDB_PASSWORD=${{ secrets.ORACLEDB_PASSWORD }} - -p ORACLEDB_DATABASE=${{ secrets.ORACLEDB_DATABASE }} - -p ORACLEDB_HOST=${{ secrets.ORACLEDB_HOST }} - -p ORACLEDB_SERVICENAME=${{ secrets.ORACLEDB_SERVICENAME }} test-frontend: name: TEST Frontend @@ -140,7 +136,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Deploys - uses: bcgov-nr/action-deployer-openshift@v0.1.0 + uses: bcgov-nr/action-deployer-openshift@v1.0.0 with: file: frontend/openshift.deploy.yml oc_namespace: ${{ secrets.OC_NAMESPACE }} @@ -169,7 +165,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Deploys - uses: bcgov-nr/action-deployer-openshift@v0.1.0 + uses: bcgov-nr/action-deployer-openshift@v1.0.0 with: file: database/openshift.deploy.yml oc_namespace: ${{ secrets.OC_NAMESPACE }} @@ -195,7 +191,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Deploys - uses: bcgov-nr/action-deployer-openshift@v0.1.0 + uses: bcgov-nr/action-deployer-openshift@v1.0.0 with: file: common/openshift.init.yml oc_namespace: ${{ secrets.OC_NAMESPACE }} @@ -219,7 +215,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Deploys - uses: bcgov-nr/action-deployer-openshift@v0.1.0 + uses: bcgov-nr/action-deployer-openshift@v1.0.0 with: file: backend/openshift.deploy.yml oc_namespace: ${{ secrets.OC_NAMESPACE }} @@ -227,6 +223,7 @@ jobs: oc_token: ${{ secrets.OC_TOKEN }} overwrite: true penetration_test: false + verification_path: health parameters: -p ZONE=${{ env.ZONE }} -p NAME=${{ github.event.repository.name }} -p PROMOTE=${{ github.repository }}/backend:${{ env.PREV }} @@ -237,11 +234,6 @@ jobs: -p CHES_CLIENT_SECRET=${{ secrets.CHES_CLIENT_SECRET }} -p CHES_TOKEN_URL='https://loginproxy.gov.bc.ca/auth/realms/comsvcauth/protocol/openid-connect/token' -p CHES_API_URL='https://ches.api.gov.bc.ca/api/v1' - -p ORACLEDB_USER=${{ secrets.ORACLEDB_USER }} - -p ORACLEDB_PASSWORD=${{ secrets.ORACLEDB_PASSWORD }} - -p ORACLEDB_DATABASE=${{ secrets.ORACLEDB_DATABASE }} - -p ORACLEDB_HOST=${{ secrets.ORACLEDB_HOST }} - -p ORACLEDB_SERVICENAME=${{ secrets.ORACLEDB_SERVICENAME }} prod-frontend: name: PROD Frontend @@ -258,7 +250,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Deploys - uses: bcgov-nr/action-deployer-openshift@v0.1.0 + uses: bcgov-nr/action-deployer-openshift@v1.0.0 with: file: frontend/openshift.deploy.yml oc_namespace: ${{ secrets.OC_NAMESPACE }} diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml index 60d4dda0cf..2b4a4ee86d 100644 --- a/.github/workflows/pr-open.yml +++ b/.github/workflows/pr-open.yml @@ -42,10 +42,10 @@ jobs: id: changelog with: github-token: ${{ github.token }} - output-file: 'CHANGELOG.md' - skip-version-file: 'true' - skip-commit: 'true' - git-push: 'false' + output-file: "CHANGELOG.md" + skip-version-file: "true" + skip-commit: "true" + git-push: "false" git-branch: refs/heads/${{ github.head_ref }} - name: Checkout pr @@ -60,9 +60,9 @@ jobs: with: message: | # Current changelog - + ${{ steps.changelog.outputs.clean_changelog }} - comment_includes: '# Current changelog' + comment_includes: "# Current changelog" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} pr-greeting: @@ -89,7 +89,6 @@ jobs: Once merged, code will be promoted and handed off to following workflow run. [Main Merge Workflow](https://github.com/${{ github.repository }}/actions/workflows/merge-main.yml) - builds: name: Builds runs-on: ubuntu-22.04 @@ -124,7 +123,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Deploys - uses: bcgov-nr/action-deployer-openshift@v0.1.0 + uses: bcgov-nr/action-deployer-openshift@v1.0.0 with: file: common/openshift.init.yml oc_namespace: ${{ secrets.OC_NAMESPACE }} @@ -141,7 +140,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Deploys - uses: bcgov-nr/action-deployer-openshift@v0.1.0 + uses: bcgov-nr/action-deployer-openshift@v1.0.0 with: file: database/openshift.deploy.yml oc_namespace: ${{ secrets.OC_NAMESPACE }} @@ -160,14 +159,14 @@ jobs: steps: - uses: actions/checkout@v3 - name: Deploys - uses: bcgov-nr/action-deployer-openshift@v0.2.0-rc1 + uses: bcgov-nr/action-deployer-openshift@v1.0.0 with: file: backend/openshift.deploy.yml oc_namespace: ${{ secrets.OC_NAMESPACE }} oc_server: ${{ secrets.OC_SERVER }} oc_token: ${{ secrets.OC_TOKEN }} overwrite: true - health_url: health + verification_path: health parameters: -p ZONE=${{ github.event.number }} -p NAME=${{ github.event.repository.name }} -p PROMOTE=${{ github.repository }}/backend:${{ github.event.number }} @@ -187,7 +186,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Deploys - uses: bcgov-nr/action-deployer-openshift@v0.1.0 + uses: bcgov-nr/action-deployer-openshift@v1.0.0 with: file: frontend/openshift.deploy.yml oc_namespace: ${{ secrets.OC_NAMESPACE }}