Merge branch 'main' into feat/1142-orchard-step-cypress-test

.github/workflows/analysis.yml

@@ -40,42 +40,6 @@ jobs:
             -Dsonar.exclusions=**/config/**,*/dto/**,**/entity/**,**/exception/**,**/filter/**,**/interceptor/**,**/response/**,**/**Builder*,**/RestExceptionEndpoint.*,**/BackendStartApiApplication.*
           sonar_token: ${{ secrets[matrix.token] }}
 
-  codeql:
-    name: Semantic Code Analysis
-    if: ${{ ! github.event.pull_request.draft }}
-    runs-on: ubuntu-22.04
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Initialize
-        uses: github/codeql-action/init@v3
-        with:
-          debug: true
-          languages: java,javascript
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: "17"
-          distribution: "temurin"
-
-        # Build Java apps, JavaScript doesn't require
-      - name: Backend Build
-        working-directory: backend
-        run: mvn --update-snapshots -P prod clean package -Dmaven.test.skip
-
-        # Build Java apps, JavaScript doesn't require
-      - name: Oracle API Build
-        working-directory: oracle-api
-        run: mvn --update-snapshots package -Dmaven.test.skip
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
-
   # https://github.com/marketplace/actions/aqua-security-trivy
   trivy:
     name: Security Scan
@@ -101,7 +65,7 @@ jobs:
   results:
     name: Analysis Results
     if: always() && (!failure()) && (!cancelled())
-    needs: [tests, codeql, trivy]
+    needs: [tests, trivy]
     runs-on: ubuntu-22.04
     steps:
       - run: echo "Workflow completed successfully!"

.github/workflows/scheduled.yml → .github/workflows/job-nightly.yml

@@ -1,4 +1,4 @@
-name: Scheduled
+name: Nightly
 
 on:
   schedule: [cron: "0 11 * * 6"] # 3 AM PST = 12 PM UDT, Saturdays
@@ -13,8 +13,8 @@ jobs:
     name: PR Env Purge
     env:
       # https://tecadmin.net/getting-yesterdays-date-in-bash/
-      DATE: "1 week ago"
-      TYPE: "po,image,pvc"
+      DATE: "4 days ago"
+      TYPE: "deployments"
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
@@ -24,19 +24,22 @@ jobs:
           oc project ${{ vars.OC_NAMESPACE }} # Safeguard!
 
           oc get ${{ env.TYPE }} -o go-template --template '{{range .items}}{{.metadata.name}} {{.metadata.creationTimestamp}}{{"\n"}}{{end}}' | \
+            grep -v workspace | \
             awk '$2 <= "'$(date -d '${{ env.DATE }}' -Ins --utc | sed 's/+0000/Z/')'" { print $1 }' | \
             xargs --no-run-if-empty oc delete ${{ env.TYPE }}
 
-  # tests:
-  #   name: Tests
-  #   secrets: inherit
-  #   uses: ./.github/workflows/.tests.yml
-  #   with:
-  #     target: test
+  tests:
+    name: Tests
+    secrets: inherit
+    uses: ./.github/workflows/.tests.yml
+    with:
+      target: test
 
   zap_scan:
     runs-on: ubuntu-latest
     name: Penetration Tests
+    # Run after other tests to avoid rate limiting
+    needs: [tests]
     env:
       DOMAIN: apps.silver.devops.gov.bc.ca
       PREFIX: ${{ github.event.repository.name }}-test

README.md

@@ -4,10 +4,9 @@
 [![Lifecycle](https://img.shields.io/badge/Lifecycle-Maturing-007EC6)](https://github.com/bcgov/repomountie/blob/master/doc/lifecycle-badges.md)
 
 #### Workflows
+[![ETL Sync](https://github.com/bcgov/nr-spar/actions/workflows/job-sync.yml/badge.svg)](https://github.com/bcgov/nr-spar/actions/workflows/job-sync.yml)
 [![Merge](https://github.com/bcgov/nr-spar/actions/workflows/merge.yml/badge.svg)](https://github.com/bcgov/nr-spar/actions/workflows/merge.yml)
-[![Analysis](https://github.com/bcgov/nr-spar/actions/workflows/analysis.yml/badge.svg)](https://github.com/bcgov/nr-spar/actions/workflows/analysis.yml)
-[![Cypress Nightly](https://github.com/bcgov/nr-spar/actions/workflows/cypress-nightly.yml/badge.svg)](https://github.com/bcgov/nr-spar/actions/workflows/cypress-nightly.yml)
-[![Scheduled](https://github.com/bcgov/nr-spar/actions/workflows/scheduled.yml/badge.svg)](https://github.com/bcgov/nr-spar/actions/workflows/scheduled.yml)
+[![Nightly](https://github.com/bcgov/nr-spar/actions/workflows/job-nightly.yml/badge.svg)](https://github.com/bcgov/nr-spar/actions/workflows/job-nightly.yml)
 
 #### Frontend
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=nr-spar_frontend&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=nr-spar_frontend)