Merge pull request #6328 from pmtk/reenable-gitops-test

USHIFT-6682: Reenable gitops test

Author: openshift-merge-bot[bot]

packaging/greenboot/functions.sh

@@ -138,3 +138,9 @@ function clear_fail_marker() {
         rm -f "${MICROSHIFT_GREENBOOT_FAIL_MARKER}"
     fi
 }
+
+# No-op shim for gitops package
+function log_script_exit() {
+    >&2 echo "log_script_exit function is deprecated and should not be used"
+    :
+}

test/bin/common_versions.sh

@@ -139,7 +139,7 @@ export CNCF_SONOBUOY_VERSION=v0.57.3
 export CNCF_SYSTEMD_LOGS_VERSION=v0.4
 
 # The current version of the microshift-gitops package.
-export GITOPS_VERSION=1.16
+export GITOPS_VERSION=1.19
 
 # The brew release versions needed for release regression testing
 BREW_Y0_RELEASE_VERSION="$(get_vrel_from_rpm "${BREW_RPM_SOURCE}/4.${MINOR_VERSION}-zstream/${UNAME_M}/")"

test/bin/pyutils/generate_common_versions.py

@@ -25,7 +25,7 @@
 CNCF_SYSTEMD_LOGS_VERSION = "v0.4"
 
 # The current version of the microshift-gitops package.
-GITOPS_VERSION = "1.16"
+GITOPS_VERSION = "1.19"
 
 
 logging.basicConfig(

test/scenarios-bootc/periodics/el98-src@gitops-telemetry-clusterid-systemd.sh

@@ -3,9 +3,7 @@
 # Sourced from scenario.sh and uses functions defined there.
 
 scenario_create_vms() {
-    # TODO: Add rhel98-bootc-source-gitops when the RPM package is updated not to use
-    # non-existent calls from the greenboot functions include file
-    prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
+    prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source-gitops
     launch_vm --boot_blueprint rhel98-bootc
 }
 
@@ -14,12 +12,11 @@ scenario_remove_vms() {
 }
 
 scenario_run_tests() {
-    # TODO: Add suites/gitops/ when the RPM package is updated not to use
-    # non-existent calls from the greenboot functions include file
     run_tests host1 \
         --variable "PROXY_HOST:${VM_BRIDGE_IP}" \
         --variable "PROXY_PORT:9001" \
         --variable "PROMETHEUS_HOST:$(hostname)" \
+        suites/gitops/ \
         suites/telemetry/telemetry.robot \
         suites/osconfig/clusterid.robot \
         suites/osconfig/systemd-resolved.robot