fix(ci): consolidate and fix scheduled jobs (#1429)

.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
@@ -14,7 +14,7 @@ jobs:
     env:
       # https://tecadmin.net/getting-yesterdays-date-in-bash/
       DATE: "1 week ago"
-      TYPE: "po,image,pvc"
+      TYPE: "all,secret,pvc,cm"
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
@@ -27,16 +27,18 @@ jobs:
             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,10 @@
 [![Lifecycle](https://img.shields.io/badge/Lifecycle-Maturing-007EC6)](https://github.com/bcgov/repomountie/blob/master/doc/lifecycle-badges.md)
 
 #### Workflows
-[![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)
+[![ETL Sync](https://github.com/bcgov/nr-spar/actions/workflows/sync-job.yml/badge.svg)](https://github.com/bcgov/nr-spar/actions/workflows/sync-job.yml)
+[![Merge](https://github.com/bcgov/nr-spar/actions/workflows/merge.yml/badge.svg)](https://github.com/bcgov/nr-spar/actions/workflows/merge.yml)
+[![Nightly](https://github.com/bcgov/nr-spar/actions/workflows/nightly.yml/badge.svg)](https://github.com/bcgov/nr-spar/actions/workflows/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)