Merge pull request #241 from bcgov/dev

Release Dev to Test
bcgov · Mar 21, 2024 · fe6dd52 · fe6dd52
2 parents d89012f + 5e5e14e
commit fe6dd52
Show file tree

Hide file tree

Showing 30 changed files with 280 additions and 11,222 deletions.
diff --git a/.config/config.json b/.config/config.json
@@ -16,8 +16,7 @@
     "db": "biohub-platform-db",
     "api": "biohub-platform-api",
     "queue": "biohub-platform-queue",
-    "app": "biohub-platform-app",
-    "geoserver": "biohub-platform-geoserver"
+    "app": "biohub-platform-app"
   },
   "staticUrls": {
     "dev": "dev-biohub-platform.apps.silver.devops.gov.bc.ca",
@@ -29,11 +28,6 @@
     "test": "api-test-biohub-platform.apps.silver.devops.gov.bc.ca",
     "prod": "api-biohub-platform.apps.silver.devops.gov.bc.ca"
   },
-  "staticUrlsGeoServer": {
-    "dev": "geoserver-dev-biohub-platform.apps.silver.devops.gov.bc.ca",
-    "test": "geoserver-test-biohub-platform.apps.silver.devops.gov.bc.ca",
-    "prod": "geoserver-biohub-platform.apps.silver.devops.gov.bc.ca"
-  },
   "siteminderLogoutURL": {
     "dev": "https://logontest7.gov.bc.ca/clp-cgi/logoff.cgi",
     "test": "https://logontest7.gov.bc.ca/clp-cgi/logoff.cgi",

diff --git a/.docker/nginx/n8n/Dockerfile b/.docker/nginx/n8n/Dockerfile
diff --git a/.docker/nginx/n8n/dev.conf b/.docker/nginx/n8n/dev.conf
diff --git a/.github/workflows/backup/deploy.yml b/.github/workflows/backup/deploy.yml
@@ -70,98 +70,3 @@ jobs:
           echo $CYPRESS_authRealm
           echo $CYPRESS_authClientId
           echo $CYPRESS_authUrl
-
-  # Build the GeoServer image
-  buildGeoserver:
-    name: Build GeoServer Image
-    runs-on: ubuntu-latest
-    if: ${{ github.event.pull_request.merged == false && github.event.pull_request.draft == false }}
-    env:
-      PR_NUMBER: ${{ github.event.number }}
-    needs:
-      - checkoutRepo
-    steps:
-      # Install Node - for `node` and `npm` commands
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 14
-
-      # Load repo from cache
-      - name: Cache repo
-        uses: actions/cache@v3
-        id: cache-repo
-        env:
-          cache-name: cache-repo
-        with:
-          path: ${{ github.workspace }}/*
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }}
-
-      # Checkout the branch if not restored via cache
-      - name: Checkout Target Branch
-        if: steps.cache-repo.outputs.cache-hit != 'true'
-        uses: actions/checkout@v3
-
-      # Log in to OpenShift.
-      # Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
-      # PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
-      - name: Log in to OpenShift
-        run: oc login --token=${{ secrets.TOOLS_SA_TOKEN }} --server=https://api.silver.devops.gov.bc.ca:6443
-
-      # Build the GeoServer image
-      - name: Build GeoServer Image
-        working-directory: "./geoserver/.pipeline/"
-        run: |
-          npm ci
-          DEBUG=* npm run build -- --pr=$PR_NUMBER
-
-  # Deploy GeoServer image
-  deployGeoserver:
-    name: Deploy Geoserver Image
-    runs-on: ubuntu-latest
-    if: ${{ github.event.pull_request.merged == false && github.event.pull_request.draft == false }}
-    env:
-      PR_NUMBER: ${{ github.event.number }}
-    needs:
-      - scaleDownPods
-      - buildGeoserver
-      # - deployDatabase
-      # - deployDatabaseSetup
-    steps:
-      # Install Node - for `node` and `npm` commands
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 14
-
-      # Load repo from cache
-      - name: Cache repo
-        uses: actions/cache@v3
-        id: cache-repo
-        env:
-          cache-name: cache-repo
-        with:
-          path: ${{ github.workspace }}/*
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }}
-
-      # Checkout the branch if not restored via cache
-      - name: Checkout Target Branch
-        if: steps.cache-repo.outputs.cache-hit != 'true'
-        uses: actions/checkout@v3
-
-      # Log in to OpenShift.
-      # Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
-      # PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
-      - name: Log in to OpenShift
-        run: oc login --token=${{ secrets.TOOLS_SA_TOKEN }} --server=https://api.silver.devops.gov.bc.ca:6443
-
-      # Deploy the GeoServer image
-      - name: Deploy GeoServer Image
-        working-directory: "./geoserver/.pipeline/"
-        run: |
-          npm ci
-          DEBUG=* npm run deploy -- --pr=$PR_NUMBER --env=dev
diff --git a/.github/workflows/cleanClosedPR.yml b/.github/workflows/cleanClosedPR.yml
@@ -73,13 +73,13 @@ jobs:
           DEBUG=* npm run clean -- --pr=$PR_NUMBER --env=build
           DEBUG=* npm run clean -- --pr=$PR_NUMBER --env=dev
 
-      # Clean the queue deployment artifacts
-      - name: Clean Queue Deployment
-        working-directory: "./api/.pipeline/"
-        run: |
-          npm ci
-          DEBUG=* npm run queue:clean -- --pr=$PR_NUMBER --env=build
-          DEBUG=* npm run queue:clean -- --pr=$PR_NUMBER --env=dev
+      #   # Clean the queue deployment artifacts
+      #   - name: Clean Queue Deployment
+      #     working-directory: "./api/.pipeline/"
+      #     run: |
+      #       npm ci
+      #       DEBUG=* npm run queue:clean -- --pr=$PR_NUMBER --env=build
+      #       DEBUG=* npm run queue:clean -- --pr=$PR_NUMBER --env=dev
 
       # Clean the reamaining build/deployment artifacts
       - name: Clean remaining Artifacts