[release-4.16] USHIFT-3273: EL94 Periodics

test/image-blueprints/layer1-base/group2/rhel93-microshift-yminus2.toml

@@ -0,0 +1,39 @@
+name = "rhel-9.3-microshift-4.{{ .Env.YMINUS2_MINOR_VERSION }}"
+description = "RHEL 9.3 with MicroShift from two minor versions back installed."
+version = "0.0.1"
+modules = []
+groups = []
+distro = "rhel-93"
+
+[[packages]]
+name = "microshift"
+version = "{{ .Env.YMINUS2_RELEASE_VERSION }}*"
+
+[[packages]]
+name = "microshift-greenboot"
+version = "{{ .Env.YMINUS2_RELEASE_VERSION }}*"
+
+[[packages]]
+name = "microshift-networking"
+version = "{{ .Env.YMINUS2_RELEASE_VERSION }}*"
+
+[[packages]]
+name = "microshift-selinux"
+version = "{{ .Env.YMINUS2_RELEASE_VERSION }}*"
+
+[[packages]]
+name = "microshift-test-agent"
+version = "*"
+
+[customizations.services]
+enabled = ["microshift", "microshift-test-agent"]
+
+[customizations.firewall]
+ports = ["22:tcp", "80:tcp", "443:tcp", "5353:udp", "6443:tcp", "30000-32767:tcp", "30000-32767:udp"]
+
+[customizations.firewall.services]
+enabled = ["mdns", "ssh", "http", "https"]
+
+[[customizations.firewall.zones]]
+name = "trusted"
+sources = ["10.42.0.0/16", "169.254.169.1"]

test/image-blueprints/layer3-periodic/group1/rhel94-crel-with-optionals.toml

@@ -0,0 +1,66 @@
+{{- if env.Getenv "CURRENT_RELEASE_VERSION" "" -}}
+{{- /*
+
+  We wrap this template in a test so that the body of the output is
+  empty when there is no "current" version release. The output file
+  must end up completely empty, so we need to remove whitespace from
+  around the first and last template instructions.
+
+*/ -}}
+
+name = "rhel-9.4-microshift-crel-optionals"
+description = "A RHEL 9.4 image with already built and released RPMs like EC, RC, or Z-stream release"
+version = "0.0.1"
+modules = []
+groups = []
+distro = "rhel-94"
+
+[[packages]]
+name = "microshift"
+version = "{{ .Env.CURRENT_RELEASE_VERSION }}"
+
+[[packages]]
+name = "microshift-greenboot"
+version = "{{ .Env.CURRENT_RELEASE_VERSION }}"
+
+[[packages]]
+name = "microshift-networking"
+version = "{{ .Env.CURRENT_RELEASE_VERSION }}"
+
+[[packages]]
+name = "microshift-selinux"
+version = "{{ .Env.CURRENT_RELEASE_VERSION }}"
+
+[[packages]]
+name = "microshift-olm"
+version = "{{ .Env.CURRENT_RELEASE_VERSION }}"
+
+[[packages]]
+name = "microshift-multus"
+version = "{{ .Env.CURRENT_RELEASE_VERSION }}"
+
+[[packages]]
+name = "microshift-test-agent"
+version = "*"
+
+[customizations.services]
+enabled = ["microshift", "microshift-test-agent"]
+
+[customizations.firewall]
+ports = [
+    "22:tcp",
+    "80:tcp",
+    "443:tcp",
+    "5353:udp",
+    "6443:tcp",
+    "30000-32767:tcp",
+    "30000-32767:udp",
+]
+
+[customizations.firewall.services]
+enabled = ["mdns", "ssh", "http", "https"]
+
+[[customizations.firewall.zones]]
+name = "trusted"
+sources = ["10.42.0.0/16", "169.254.169.1"]
+{{- end -}}

test/image-blueprints/layer3-periodic/group1/rhel94-source-with-optionals.toml

@@ -0,0 +1,51 @@
+name = "rhel-9.4-microshift-source-optionals"
+description = "A RHEL 9.4 image with MicroShift and OLM built from source."
+version = "0.0.1"
+modules = []
+groups = []
+distro = "rhel-94"
+
+[[packages]]
+name = "microshift"
+version = "{{ .Env.SOURCE_VERSION }}"
+
+[[packages]]
+name = "microshift-greenboot"
+version = "{{ .Env.SOURCE_VERSION }}"
+
+[[packages]]
+name = "microshift-networking"
+version = "{{ .Env.SOURCE_VERSION }}"
+
+[[packages]]
+name = "microshift-selinux"
+version = "{{ .Env.SOURCE_VERSION }}"
+
+[[packages]]
+name = "microshift-olm"
+version = "{{ .Env.SOURCE_VERSION }}"
+
+[[packages]]
+name = "microshift-multus"
+version = "{{ .Env.SOURCE_VERSION }}"
+
+[[packages]]
+name = "microshift-test-agent"
+version = "*"
+
+[[packages]]
+name = "systemd-resolved"
+version = "*"
+
+[customizations.services]
+enabled = ["microshift", "microshift-test-agent"]
+
+[customizations.firewall]
+ports = ["22:tcp", "80:tcp", "443:tcp", "5353:udp", "6443:tcp", "30000-32767:tcp", "30000-32767:udp"]
+
+[customizations.firewall.services]
+enabled = ["mdns", "ssh", "http", "https"]
+
+[[customizations.firewall.zones]]
+name = "trusted"
+sources = ["10.42.0.0/16", "169.254.169.1"]

test/scenarios-periodics/el92-src@optional-upgrade.sh → test/scenarios-periodics/el92-crel@el94-src@optional-upgrade.sh.pending_crel

@@ -4,7 +4,7 @@
 
 scenario_create_vms() {
 	prepare_kickstart host1 kickstart.ks.template rhel-9.2-microshift-crel-optionals
-	launch_vm host1
+	launch_vm host1 rhel-9.2
 }
 
 scenario_remove_vms() {
@@ -13,6 +13,6 @@ scenario_remove_vms() {
 
 scenario_run_tests() {
 	run_tests host1 \
-		--variable "TARGET_REF:rhel-9.2-microshift-source-optionals" \
+		--variable "TARGET_REF:rhel-9.4-microshift-source-optionals" \
 		suites/upgrade/upgrade-multus.robot
 }

test/scenarios-periodics/el92-prel@el94-crel@upgrade-ok.sh.pending_crel

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Sourced from cleanup_scenario.sh and uses functions defined there.
+
+scenario_create_vms() {
+    # Determine the starting image based on the source tree current
+    # version, minus one.
+    local start_image
+    start_image="rhel-9.2-microshift-4.$(previous_minor_version)"
+
+    prepare_kickstart host1 kickstart.ks.template "${start_image}"
+	launch_vm host1 rhel-9.2
+}
+
+scenario_remove_vms() {
+    remove_vm host1
+}
+
+scenario_run_tests() {
+    run_tests host1 \
+              --variable "TARGET_REF:rhel-9.4-microshift-crel" \
+              suites/upgrade/upgrade-successful.robot
+}

test/scenarios-periodics/el92-prel@upgrade-fails-and-rolls-back.sh → test/scenarios-periodics/el92-prel@el94-src@upgrade-fails-and-rolls-back.sh

@@ -4,7 +4,7 @@
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart.ks.template rhel-9.2-microshift-4."$(previous_minor_version)"
-    launch_vm host1
+    launch_vm host1 rhel-9.2
 }
 
 scenario_remove_vms() {
@@ -15,7 +15,7 @@ scenario_remove_vms() {
 # I.e. CI jobs testing release-4.14 will always compile the latest 4.14 code as the source_version.
 scenario_run_tests() {
     run_tests host1 \
-        --variable "FAILING_REF:rhel-9.2-microshift-source" \
+        --variable "FAILING_REF:rhel-9.4-microshift-source" \
         --variable "REASON:fail_greenboot" \
         suites/upgrade/upgrade-fails-and-rolls-back.robot
 }

test/scenarios-periodics/el92-prel@el94-src@upgrade-ok.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Sourced from cleanup_scenario.sh and uses functions defined there.
+
+scenario_create_vms() {
+    # Determine the starting image based on the source tree current
+    # version, minus one.
+    local start_image
+    start_image="rhel-9.2-microshift-4.$(previous_minor_version)"
+
+    prepare_kickstart host1 kickstart.ks.template "${start_image}"
+	launch_vm host1 rhel-9.2
+}
+
+scenario_remove_vms() {
+    remove_vm host1
+}
+
+scenario_run_tests() {
+    run_tests host1 \
+              --variable "TARGET_REF:rhel-9.4-microshift-source" \
+              suites/upgrade/upgrade-successful.robot
+}

test/scenarios-periodics/el92-yminus2@el94-crel@upgrade-ok.sh.pending_crel

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Sourced from scenario.sh and uses functions defined there.
+
+scenario_create_vms() {
+    # Determine the starting image based on the source tree current
+    # version, minus one.
+    local start_image
+    start_image="rhel-9.2-microshift-4.$(yminus2_minor_version)"
+
+    prepare_kickstart host1 kickstart.ks.template "${start_image}"
+	launch_vm host1 rhel-9.2
+}
+
+scenario_remove_vms() {
+    remove_vm host1
+}
+
+scenario_run_tests() {
+    run_tests host1 \
+              --variable "TARGET_REF:rhel-9.4-microshift-crel" \
+              suites/upgrade/upgrade-successful.robot
+}

test/scenarios-periodics/el93-prel@el94-crel@upgrade-ok.sh.pending_crel

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Sourced from cleanup_scenario.sh and uses functions defined there.
+
+scenario_create_vms() {
+    # Determine the starting image based on the source tree current
+    # version, minus one.
+    local start_image
+    start_image="rhel-9.3-microshift-4.$(previous_minor_version)"
+
+    prepare_kickstart host1 kickstart.ks.template "${start_image}"
+    launch_vm host1 rhel-9.3
+}
+
+scenario_remove_vms() {
+    remove_vm host1
+}
+
+scenario_run_tests() {
+    run_tests host1 \
+              --variable "TARGET_REF:rhel-9.4-microshift-crel" \
+              suites/upgrade/upgrade-successful.robot
+}

test/scenarios-periodics/el93-prel@el94-src@upgrade-ok.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Sourced from cleanup_scenario.sh and uses functions defined there.
+
+scenario_create_vms() {
+    # Determine the starting image based on the source tree current
+    # version, minus one.
+    local start_image
+    start_image="rhel-9.3-microshift-4.$(previous_minor_version)"
+
+    prepare_kickstart host1 kickstart.ks.template "${start_image}"
+    launch_vm host1 rhel-9.3
+}
+
+scenario_remove_vms() {
+    remove_vm host1
+}
+
+scenario_run_tests() {
+    run_tests host1 \
+              --variable "TARGET_REF:rhel-9.4-microshift-source" \
+              suites/upgrade/upgrade-successful.robot
+}