From d978d29a2077db629318b294b2414f560c2a219e Mon Sep 17 00:00:00 2001 From: Fergus MacConnell Date: Wed, 30 Oct 2024 12:52:11 -0700 Subject: [PATCH] chore(ci): Uncomment workflow deploy code. (#121) --- .github/workflows/.deploy.yml | 179 +++++++++++++++++----------------- .github/workflows/pr-open.yml | 3 +- 2 files changed, 90 insertions(+), 92 deletions(-) diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml index 4ba726867..c531cd300 100644 --- a/.github/workflows/.deploy.yml +++ b/.github/workflows/.deploy.yml @@ -53,100 +53,99 @@ jobs: -p S3_HOST=${{ secrets.S3_HOST }} -p S3_ROOT_BUCKET=${{ secrets.S3_ROOT_BUCKET }} - # database: - # name: Database - # needs: init - # # environment: ${{ inputs.environment }} - # runs-on: ubuntu-latest - # steps: - # - name: Database - # 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 }} - # oc_version: "4.14.37" - # file: database/openshift.deploy.yml - # overwrite: true - # parameters: - # -p DATABASE_SERVICE_NAME=gwells-dev-${{ github.event.number }}-database - # -p IMAGE_STREAM_NAMESPACE=${{ vars.OC_NAMESPACE }} - # -p IMAGE_STREAM_NAME=crunchy-postgres-gis - # -p IMAGE_TAG=${{ github.event.number }} - # -p NAME_SUFFIX=-dev-${{ github.event.number }} - # -p STORAGE_CLASS=netapp-file-standard - # -p REQUEST_CPU=200m - # -p LIMIT_CPU=500m - # -p LIMIT_MEMORY=1Gi + database: + name: Database + needs: init + # environment: ${{ inputs.environment }} + runs-on: ubuntu-latest + steps: + - name: Database + 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 }} + oc_version: "4.14.37" + file: database/openshift.deploy.yml + overwrite: true + parameters: + -p DATABASE_SERVICE_NAME=gwells-dev-${{ github.event.number }}-database + -p IMAGE_STREAM_NAMESPACE=${{ vars.OC_NAMESPACE }} + -p IMAGE_STREAM_NAME=crunchy-postgres-gis + -p IMAGE_TAG=${{ github.event.number }} + -p NAME_SUFFIX=-dev-${{ github.event.number }} + -p STORAGE_CLASS=netapp-file-standard + -p REQUEST_CPU=200m + -p LIMIT_CPU=500m + -p LIMIT_MEMORY=1Gi - # backend: - # name: Backend - # needs: [ init, database ] - # # environment: ${{ inputs.environment }} - # runs-on: ubuntu-latest - # 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 }} - # oc_version: "4.14.37" - # file: backend/openshift.deploy.yml - # parameters: - # -p NAME_SUFFIX=-dev-${{ github.event.number }} - # -p IMAGE_TAG=${{ github.event.number }} - # -p ENV_NAME=dev - # -p E_LICENSING_URL=${{ vars.E_LICENSING_URL }} - # -p DB_REPLICATE=${{ vars.DB_REPLICATE }} - # -p DJANGO_DEBUG=${{ vars.DJANGO_DEBUG }} - # -p ENABLE_ADDITIONAL_DOCUMENTS=${{ vars.ENABLE_ADDITIONAL_DOCUMENTS }} - # -p S3_PRIVATE_BUCKET=${{ vars.S3_PRIVATE_BUCKET }} - # -p S3_PRIVATE_HOST=${{ vars.S3_PRIVATE_HOST }} - # -p S3_WELL_EXPORT_BUCKET=${{ vars.S3_WELL_EXPORT_BUCKET }} - # -p SSO_AUDIENCE=${{ vars.SSO_AUDIENCE }} - # -p SSO_AUTH_HOST=${{ vars.SSO_AUTH_HOST }} - # -p SSO_CLIENT=${{ vars.SSO_CLIENT }} - # -p SSO_IDP_HINT=${{ vars.SSO_IDP_HINT }} - # -p SSO_PORT=${{ vars.SSO_PORT }} - # -p SSO_PUBKEY=${{ vars.SSO_PUBKEY }} - # -p SSO_REALM=${{ vars.SSO_REALM }} - # -p SSO_TEST_AUDIENCE=${{ vars.SSO_TEST_AUDIENCE }} - # -p SSO_TEST_CLIENT=${{ vars.SSO_TEST_CLIENT }} - # -p GDAL_LIBRARY_PATH=${{ vars.GDAL_LIBRARY_PATH }} - # -p GEOS_LIBRARY_PATH=${{ vars.GEOS_LIBRARY_PATH }} - # -p S3_AQUIFER_BUCKET=${{ vars.S3_AQUIFER_BUCKET }} - # -p S3_REGISTRANT_BUCKET=${{ vars.S3_REGISTRANT_BUCKET }} - # -p S3_PRIVATE_ROOT_BUCKET=${{ vars.S3_PRIVATE_ROOT_BUCKET }} - # -p S3_PRIVATE_AQUIFER_BUCKET=${{ vars.S3_PRIVATE_AQUIFER_BUCKET }} - # -p S3_PRIVATE_REGISTRANT_BUCKET=${{ vars.S3_PRIVATE_REGISTRANT_BUCKET }} - # -p S3_PRIVATE_WELL_BUCKET=${{ vars.S3_PRIVATE_WELL_BUCKET }} - # -p ENABLE_AQUIFERS_SEARCH=${{ vars.ENABLE_AQUIFERS_SEARCH }} - # -p EMAIL_NOTIFICATION_RECIPIENT=${{ vars.EMAIL_NOTIFICATION_RECIPIENT }} - # -p GEOCODER_ADDRESS_API_BASE=${{ vars.GEOCODER_ADDRESS_API_BASE }} + backend: + name: Backend + needs: [ init, database ] + # environment: ${{ inputs.environment }} + runs-on: ubuntu-latest + 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 }} + oc_version: "4.14.37" + file: backend/openshift.deploy.yml + parameters: + -p NAME_SUFFIX=-dev-${{ github.event.number }} + -p IMAGE_TAG=${{ github.event.number }} + -p ENV_NAME=dev + -p E_LICENSING_URL=${{ vars.E_LICENSING_URL }} + -p DB_REPLICATE=${{ vars.DB_REPLICATE }} + -p DJANGO_DEBUG=${{ vars.DJANGO_DEBUG }} + -p ENABLE_ADDITIONAL_DOCUMENTS=${{ vars.ENABLE_ADDITIONAL_DOCUMENTS }} + -p S3_PRIVATE_BUCKET=${{ vars.S3_PRIVATE_BUCKET }} + -p S3_PRIVATE_HOST=${{ vars.S3_PRIVATE_HOST }} + -p S3_WELL_EXPORT_BUCKET=${{ vars.S3_WELL_EXPORT_BUCKET }} + -p SSO_AUDIENCE=${{ vars.SSO_AUDIENCE }} + -p SSO_AUTH_HOST=${{ vars.SSO_AUTH_HOST }} + -p SSO_CLIENT=${{ vars.SSO_CLIENT }} + -p SSO_IDP_HINT=${{ vars.SSO_IDP_HINT }} + -p SSO_PORT=${{ vars.SSO_PORT }} + -p SSO_PUBKEY=${{ vars.SSO_PUBKEY }} + -p SSO_REALM=${{ vars.SSO_REALM }} + -p SSO_TEST_AUDIENCE=${{ vars.SSO_TEST_AUDIENCE }} + -p SSO_TEST_CLIENT=${{ vars.SSO_TEST_CLIENT }} + -p GDAL_LIBRARY_PATH=${{ vars.GDAL_LIBRARY_PATH }} + -p GEOS_LIBRARY_PATH=${{ vars.GEOS_LIBRARY_PATH }} + -p S3_AQUIFER_BUCKET=${{ vars.S3_AQUIFER_BUCKET }} + -p S3_REGISTRANT_BUCKET=${{ vars.S3_REGISTRANT_BUCKET }} + -p S3_PRIVATE_ROOT_BUCKET=${{ vars.S3_PRIVATE_ROOT_BUCKET }} + -p S3_PRIVATE_AQUIFER_BUCKET=${{ vars.S3_PRIVATE_AQUIFER_BUCKET }} + -p S3_PRIVATE_REGISTRANT_BUCKET=${{ vars.S3_PRIVATE_REGISTRANT_BUCKET }} + -p S3_PRIVATE_WELL_BUCKET=${{ vars.S3_PRIVATE_WELL_BUCKET }} + -p ENABLE_AQUIFERS_SEARCH=${{ vars.ENABLE_AQUIFERS_SEARCH }} + -p EMAIL_NOTIFICATION_RECIPIENT=${{ vars.EMAIL_NOTIFICATION_RECIPIENT }} + -p GEOCODER_ADDRESS_API_BASE=${{ vars.GEOCODER_ADDRESS_API_BASE }} - # frontend: - # name: Frontend - # needs: [ init, database, backend ] - # # environment: ${{ inputs.environment }} - # runs-on: ubuntu-latest - # 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 }} - # oc_version: "4.14.37" - # file: frontend/openshift.deploy.yml - # parameters: - # -p NAME_SUFFIX=-dev-${{ github.event.number }} - # -p IMAGE_TAG=${{ github.event.number }} - # -p ENV_NAME=dev + frontend: + name: Frontend + needs: [ init, database, backend ] + # environment: ${{ inputs.environment }} + runs-on: ubuntu-latest + 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 }} + oc_version: "4.14.37" + file: frontend/openshift.deploy.yml + parameters: + -p NAME_SUFFIX=-dev-${{ github.event.number }} + -p IMAGE_TAG=${{ github.event.number }} + -p ENV_NAME=dev minio: name: Minio - # needs: [ init, database, backend, frontend ] - needs: [ init ] + needs: [ init, database, backend, frontend ] runs-on: ubuntu-latest steps: - name: Deploy Minio diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml index 39999f1ef..f041baa06 100644 --- a/.github/workflows/pr-open.yml +++ b/.github/workflows/pr-open.yml @@ -15,8 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - # package: [database, backend, frontend, minio] - package: [minio] + package: [database, backend, frontend, minio] timeout-minutes: 20 steps: - uses: bcgov-nr/action-builder-ghcr@v2.2.0