Merge pull request containers#17383 from cevich/revert_emergency_fix

[CI:BUILD] Cirrus: Fix GraphQL ownerRepository:null error
n8henrie · Feb 7, 2023 · 93a3668 · 93a3668
2 parents 77ab826 + 50f72fe
commit 93a3668
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.github/actions/check_cirrus_cron/cron_failures.sh b/.github/actions/check_cirrus_cron/cron_failures.sh
@@ -19,7 +19,7 @@ confirm_gha_environment
 mkdir -p ./artifacts
 cat > ./artifacts/query_raw.json << "EOF"
 query {
-  ownerRepository(platform: "LINUX", owner: "@@OWNER@@", name: "@@REPO@@") {
+  ownerRepository(platform: "github", owner: "@@OWNER@@", name: "@@REPO@@") {
     cronSettings {
       name
       lastInvocationBuild {

diff --git a/contrib/cirrus/prebuild.sh b/contrib/cirrus/prebuild.sh
@@ -45,9 +45,15 @@ if [[ "${DISTRO_NV}" =~ fedora ]]; then
     # Tests for lib.sh
     showrun ${SCRIPT_BASE}/lib.sh.t
 
-    export PREBUILD=1
-    # TODO: Disabled due to test failure breaking all PRs
-    # showrun bash ${CIRRUS_WORKING_DIR}/.github/actions/check_cirrus_cron/test.sh
+    # Run this during daily cron job to prevent a GraphQL API change/breakage
+    # from impacting every PR.  Down-side being if it does fail, a maintainer
+    # will need to do some archaeology to find it.
+    # Defined by CI system
+    # shellcheck disable=SC2154
+    if [[ "$CIRRUS_CRON" == "main" ]]; then
+      export PREBUILD=1
+      showrun bash ${CIRRUS_WORKING_DIR}/.github/actions/check_cirrus_cron/test.sh
+    fi
 fi
 
 msg "Checking 3rd party network service connectivity"