diff --git a/test/image-blueprints/layer1-base/group2/rhel92-microshift-previous-minor.image-installer b/test/image-blueprints/layer1-base/group2/rhel92-microshift-previous-minor.image-installer deleted file mode 100644 index bcd674ef29..0000000000 --- a/test/image-blueprints/layer1-base/group2/rhel92-microshift-previous-minor.image-installer +++ /dev/null @@ -1 +0,0 @@ -rhel-9.2-microshift-4.{{ .Env.PREVIOUS_MINOR_VERSION }} \ No newline at end of file diff --git a/test/image-blueprints/layer1-base/group2/rhel93-microshift-previous-minor.image-installer b/test/image-blueprints/layer1-base/group2/rhel93-microshift-previous-minor.image-installer deleted file mode 100644 index cc72e1dc59..0000000000 --- a/test/image-blueprints/layer1-base/group2/rhel93-microshift-previous-minor.image-installer +++ /dev/null @@ -1 +0,0 @@ -rhel-9.3-microshift-4.{{ .Env.PREVIOUS_MINOR_VERSION }} \ No newline at end of file diff --git a/test/image-blueprints/layer1-base/group2/rhel93-microshift-previous-minor.toml b/test/image-blueprints/layer1-base/group2/rhel93-microshift-previous-minor.toml deleted file mode 100644 index 43a1487bcd..0000000000 --- a/test/image-blueprints/layer1-base/group2/rhel93-microshift-previous-minor.toml +++ /dev/null @@ -1,39 +0,0 @@ -name = "rhel-9.3-microshift-4.{{ .Env.PREVIOUS_MINOR_VERSION }}" -description = "RHEL 9.3 with MicroShift from the previous minor version (y-stream) installed." -version = "0.0.1" -modules = [] -groups = [] -distro = "rhel-93" - -[[packages]] -name = "microshift" -version = "{{ .Env.PREVIOUS_RELEASE_VERSION }}*" - -[[packages]] -name = "microshift-greenboot" -version = "{{ .Env.PREVIOUS_RELEASE_VERSION }}*" - -[[packages]] -name = "microshift-networking" -version = "{{ .Env.PREVIOUS_RELEASE_VERSION }}*" - -[[packages]] -name = "microshift-selinux" -version = "{{ .Env.PREVIOUS_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"] diff --git a/test/image-blueprints/layer1-base/group2/rhel94-microshift-previous-minor.image-installer b/test/image-blueprints/layer1-base/group2/rhel94-microshift-previous-minor.image-installer new file mode 100644 index 0000000000..666f63406f --- /dev/null +++ b/test/image-blueprints/layer1-base/group2/rhel94-microshift-previous-minor.image-installer @@ -0,0 +1 @@ +rhel-9.4-microshift-4.{{ .Env.PREVIOUS_MINOR_VERSION }} \ No newline at end of file diff --git a/test/image-blueprints/layer1-base/group2/rhel92-microshift-previous-minor.toml b/test/image-blueprints/layer1-base/group2/rhel94-microshift-previous-minor.toml similarity index 85% rename from test/image-blueprints/layer1-base/group2/rhel92-microshift-previous-minor.toml rename to test/image-blueprints/layer1-base/group2/rhel94-microshift-previous-minor.toml index 4c38c15581..70806bf28f 100644 --- a/test/image-blueprints/layer1-base/group2/rhel92-microshift-previous-minor.toml +++ b/test/image-blueprints/layer1-base/group2/rhel94-microshift-previous-minor.toml @@ -1,9 +1,9 @@ -name = "rhel-9.2-microshift-4.{{ .Env.PREVIOUS_MINOR_VERSION }}" -description = "RHEL 9.2 with MicroShift from the previous minor version (y-stream) installed." +name = "rhel-9.4-microshift-4.{{ .Env.PREVIOUS_MINOR_VERSION }}" +description = "RHEL 9.4 with MicroShift from the previous minor version (y-stream) installed." version = "0.0.1" modules = [] groups = [] -distro = "rhel-92" +distro = "rhel-94" [[packages]] name = "microshift" diff --git a/test/image-blueprints/layer2-presubmit/group1/rhel-9.2-microshift-source-aux.alias b/test/image-blueprints/layer2-presubmit/group1/rhel-9.2-microshift-source-aux.alias deleted file mode 100644 index 1d53c6e749..0000000000 --- a/test/image-blueprints/layer2-presubmit/group1/rhel-9.2-microshift-source-aux.alias +++ /dev/null @@ -1 +0,0 @@ -rhel-9.2-microshift-source \ No newline at end of file diff --git a/test/image-blueprints/layer2-presubmit/group1/rhel92-crel.toml b/test/image-blueprints/layer2-presubmit/group1/rhel92-crel.toml deleted file mode 100644 index bfcf67063d..0000000000 --- a/test/image-blueprints/layer2-presubmit/group1/rhel92-crel.toml +++ /dev/null @@ -1,58 +0,0 @@ -{{- 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.2-microshift-crel" -description = "A RHEL 9.2 image with already built and released RPMs like EC, RC, or Z-stream release" -version = "0.0.1" -modules = [] -groups = [] -distro = "rhel-92" - -[[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-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 -}} diff --git a/test/image-blueprints/layer2-presubmit/group1/rhel92-source-base.toml b/test/image-blueprints/layer2-presubmit/group1/rhel92-source-base.toml deleted file mode 100644 index a74f48c75b..0000000000 --- a/test/image-blueprints/layer2-presubmit/group1/rhel92-source-base.toml +++ /dev/null @@ -1,39 +0,0 @@ -name = "rhel-9.2-microshift-source-base" -description = "A RHEL 9.2 image with the RPMs built from source from the base release branch" -version = "0.0.1" -modules = [] -groups = [] -distro = "rhel-92" - -[[packages]] -name = "microshift" -version = "{{ .Env.SOURCE_VERSION_BASE }}" - -[[packages]] -name = "microshift-greenboot" -version = "{{ .Env.SOURCE_VERSION_BASE }}" - -[[packages]] -name = "microshift-networking" -version = "{{ .Env.SOURCE_VERSION_BASE }}" - -[[packages]] -name = "microshift-selinux" -version = "{{ .Env.SOURCE_VERSION_BASE }}" - -[[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"] diff --git a/test/image-blueprints/layer2-presubmit/group1/rhel92-source-fake-next-minor.toml b/test/image-blueprints/layer2-presubmit/group1/rhel92-source-fake-next-minor.toml deleted file mode 100644 index 961d6122cd..0000000000 --- a/test/image-blueprints/layer2-presubmit/group1/rhel92-source-fake-next-minor.toml +++ /dev/null @@ -1,39 +0,0 @@ -name = "rhel-9.2-microshift-source-fake-next-minor" -description = "A RHEL 9.2 image with the RPMs built from source from the current PR but with the _version_ set to the next y-stream." -version = "0.0.1" -modules = [] -groups = [] -distro = "rhel-92" - -[[packages]] -name = "microshift" -version = "4.{{ .Env.FAKE_NEXT_MINOR_VERSION }}.*" - -[[packages]] -name = "microshift-greenboot" -version = "4.{{ .Env.FAKE_NEXT_MINOR_VERSION }}.*" - -[[packages]] -name = "microshift-networking" -version = "4.{{ .Env.FAKE_NEXT_MINOR_VERSION }}.*" - -[[packages]] -name = "microshift-selinux" -version = "4.{{ .Env.FAKE_NEXT_MINOR_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"] diff --git a/test/image-blueprints/layer2-presubmit/group1/rhel92-source.toml b/test/image-blueprints/layer2-presubmit/group1/rhel92-source.toml deleted file mode 100644 index 9f3342bba5..0000000000 --- a/test/image-blueprints/layer2-presubmit/group1/rhel92-source.toml +++ /dev/null @@ -1,43 +0,0 @@ -name = "rhel-9.2-microshift-source" -description = "A RHEL 9.2 image with the RPMs built from source." -version = "0.0.1" -modules = [] -groups = [] -distro = "rhel-92" - -[[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-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"] diff --git a/test/image-blueprints/layer3-periodic/group1/rhel92-crel-with-optionals.toml b/test/image-blueprints/layer3-periodic/group1/rhel92-crel-with-optionals.toml deleted file mode 100644 index 2db678eb10..0000000000 --- a/test/image-blueprints/layer3-periodic/group1/rhel92-crel-with-optionals.toml +++ /dev/null @@ -1,66 +0,0 @@ -{{- 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.2-microshift-crel-optionals" -description = "A RHEL 9.2 image with already built and released RPMs like EC, RC, or Z-stream release" -version = "0.0.1" -modules = [] -groups = [] -distro = "rhel-92" - -[[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 -}} diff --git a/test/image-blueprints/layer3-periodic/group1/rhel92-source-with-optionals.toml b/test/image-blueprints/layer3-periodic/group1/rhel92-source-with-optionals.toml deleted file mode 100644 index a3a292785c..0000000000 --- a/test/image-blueprints/layer3-periodic/group1/rhel92-source-with-optionals.toml +++ /dev/null @@ -1,51 +0,0 @@ -name = "rhel-9.2-microshift-source-optionals" -description = "A RHEL 9.2 image with MicroShift and OLM built from source." -version = "0.0.1" -modules = [] -groups = [] -distro = "rhel-92" - -[[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"] diff --git a/test/image-blueprints/layer3-periodic/group1/rhel93-crel.toml b/test/image-blueprints/layer3-periodic/group1/rhel93-crel.toml deleted file mode 100644 index b81e31c123..0000000000 --- a/test/image-blueprints/layer3-periodic/group1/rhel93-crel.toml +++ /dev/null @@ -1,58 +0,0 @@ -{{- 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.3-microshift-crel" -description = "A RHEL 9.3 image with already built and released RPMs like EC, RC, or Z-stream release" -version = "0.0.1" -modules = [] -groups = [] -distro = "rhel-93" - -[[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-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 -}} diff --git a/test/image-blueprints/layer3-periodic/group1/rhel93-source.toml b/test/image-blueprints/layer3-periodic/group1/rhel93-source.toml deleted file mode 100644 index 81215a6bce..0000000000 --- a/test/image-blueprints/layer3-periodic/group1/rhel93-source.toml +++ /dev/null @@ -1,43 +0,0 @@ -name = "rhel-9.3-microshift-source" -description = "A RHEL 9.3 image with the RPMs built from source." -version = "0.0.1" -modules = [] -groups = [] -distro = "rhel-93" - -[[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-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"] diff --git a/test/image-blueprints/layer4-ext/group1/rhel92_microshift-ext.image-installer b/test/image-blueprints/layer4-ext/group1/rhel92_microshift-ext.image-installer deleted file mode 100644 index 6b3e298913..0000000000 --- a/test/image-blueprints/layer4-ext/group1/rhel92_microshift-ext.image-installer +++ /dev/null @@ -1 +0,0 @@ -rhel-92-microshift-ext diff --git a/test/image-blueprints/layer4-ext/group1/rhel92_microshift-ext.toml b/test/image-blueprints/layer4-ext/group1/rhel92_microshift-ext.toml deleted file mode 100644 index 18b96e29f4..0000000000 --- a/test/image-blueprints/layer4-ext/group1/rhel92_microshift-ext.toml +++ /dev/null @@ -1,67 +0,0 @@ -name = "rhel-92-microshift-ext" -description = "A RHEL 9.2 image built from external RPMs." -version = "0.0.1" -modules = [] -groups = [] -distro = "rhel-92" - -[[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 = "systemd-resolved" -version = "*" - -[[packages]] -name = "iputils" -version = "*" - -[[packages]] -name = "bind-utils" -version = "*" - -[[packages]] -name = "net-tools" -version = "*" - -[[packages]] -name = "iotop" -version = "*" - -[[packages]] -name = "strace" -version = "*" - -[[packages]] -name = "iproute-tc" -version = "*" - -[[packages]] -name = "kernel-modules-extra" -version = "*" - -[customizations.services] -enabled = ["microshift"] - -[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"] diff --git a/test/image-blueprints/layer4-ext/group1/rhel93_microshift-ext.image-installer b/test/image-blueprints/layer4-ext/group1/rhel93_microshift-ext.image-installer deleted file mode 100644 index 318b48d0c8..0000000000 --- a/test/image-blueprints/layer4-ext/group1/rhel93_microshift-ext.image-installer +++ /dev/null @@ -1 +0,0 @@ -rhel-93-microshift-ext diff --git a/test/image-blueprints/layer4-ext/group1/rhel94_microshift-ext.image-installer b/test/image-blueprints/layer4-ext/group1/rhel94_microshift-ext.image-installer new file mode 100644 index 0000000000..bc9c593a49 --- /dev/null +++ b/test/image-blueprints/layer4-ext/group1/rhel94_microshift-ext.image-installer @@ -0,0 +1 @@ +rhel-94-microshift-ext diff --git a/test/image-blueprints/layer4-ext/group1/rhel93_microshift-ext.toml b/test/image-blueprints/layer4-ext/group1/rhel94_microshift-ext.toml similarity index 90% rename from test/image-blueprints/layer4-ext/group1/rhel93_microshift-ext.toml rename to test/image-blueprints/layer4-ext/group1/rhel94_microshift-ext.toml index d5aa9a88eb..96e2664844 100644 --- a/test/image-blueprints/layer4-ext/group1/rhel93_microshift-ext.toml +++ b/test/image-blueprints/layer4-ext/group1/rhel94_microshift-ext.toml @@ -1,9 +1,9 @@ -name = "rhel-93-microshift-ext" -description = "A RHEL 9.3 image built with external RPMs." +name = "rhel-94-microshift-ext" +description = "A RHEL 9.4 image built from external RPMs." version = "0.0.1" modules = [] groups = [] -distro = "rhel-93" +distro = "rhel-94" [[packages]] name = "microshift" diff --git a/test/scenarios-upgrades/el92-crel@el94-src@optional-upgrade.sh b/test/scenarios-upgrades/el92-crel@el94-src@optional-upgrade.sh deleted file mode 100644 index ea70e3f844..0000000000 --- a/test/scenarios-upgrades/el92-crel@el94-src@optional-upgrade.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -scenario_create_vms() { - prepare_kickstart host1 kickstart.ks.template rhel-9.2-microshift-crel-optionals - 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-optionals" \ - suites/upgrade/upgrade-multus.robot -} diff --git a/test/scenarios-upgrades/el93-prel@el94-crel@upgrade-ok.sh b/test/scenarios-upgrades/el93-prel@el94-crel@upgrade-ok.sh deleted file mode 100644 index c9af1f4ece..0000000000 --- a/test/scenarios-upgrades/el93-prel@el94-crel@upgrade-ok.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -scenario_create_vms() { - prepare_kickstart host1 kickstart.ks.template "rhel-9.3-microshift-4.${PREVIOUS_MINOR_VERSION}" - 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 -} diff --git a/test/scenarios-upgrades/el93-prel@el94-src@upgrade-ok.sh b/test/scenarios-upgrades/el93-prel@el94-src@upgrade-ok.sh deleted file mode 100644 index f6df30fbfe..0000000000 --- a/test/scenarios-upgrades/el93-prel@el94-src@upgrade-ok.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -scenario_create_vms() { - prepare_kickstart host1 kickstart.ks.template "rhel-9.3-microshift-4.${PREVIOUS_MINOR_VERSION}" - 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 -} diff --git a/test/scenarios-upgrades/el92-prel@el94-crel@upgrade-ok.sh b/test/scenarios-upgrades/el94-prel@el94-crel@upgrade-ok.sh similarity index 79% rename from test/scenarios-upgrades/el92-prel@el94-crel@upgrade-ok.sh rename to test/scenarios-upgrades/el94-prel@el94-crel@upgrade-ok.sh index 3ae758ff4c..a199c1be78 100644 --- a/test/scenarios-upgrades/el92-prel@el94-crel@upgrade-ok.sh +++ b/test/scenarios-upgrades/el94-prel@el94-crel@upgrade-ok.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart.ks.template "rhel-9.2-microshift-4.${PREVIOUS_MINOR_VERSION}" - launch_vm host1 rhel-9.2 + prepare_kickstart host1 kickstart.ks.template "rhel-9.4-microshift-4.${PREVIOUS_MINOR_VERSION}" + launch_vm host1 } scenario_remove_vms() { diff --git a/test/scenarios-upgrades/el92-prel@el94-src@upgrade-fails-and-rolls-back.sh b/test/scenarios-upgrades/el94-prel@el94-src@upgrade-fails-and-rolls-back.sh similarity index 86% rename from test/scenarios-upgrades/el92-prel@el94-src@upgrade-fails-and-rolls-back.sh rename to test/scenarios-upgrades/el94-prel@el94-src@upgrade-fails-and-rolls-back.sh index 8e6025d434..5bbbe3730c 100644 --- a/test/scenarios-upgrades/el92-prel@el94-src@upgrade-fails-and-rolls-back.sh +++ b/test/scenarios-upgrades/el94-prel@el94-src@upgrade-fails-and-rolls-back.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart.ks.template "rhel-9.2-microshift-4.${PREVIOUS_MINOR_VERSION}" - launch_vm host1 rhel-9.2 + prepare_kickstart host1 kickstart.ks.template "rhel-9.4-microshift-4.${PREVIOUS_MINOR_VERSION}" + launch_vm host1 } scenario_remove_vms() { diff --git a/test/scenarios/el92-prel@el94-src@upgrade-ok.sh b/test/scenarios-upgrades/el94-prel@el94-src@upgrade-ok.sh similarity index 85% rename from test/scenarios/el92-prel@el94-src@upgrade-ok.sh rename to test/scenarios-upgrades/el94-prel@el94-src@upgrade-ok.sh index 90d4f7ec81..bd1a53ede2 100644 --- a/test/scenarios/el92-prel@el94-src@upgrade-ok.sh +++ b/test/scenarios-upgrades/el94-prel@el94-src@upgrade-ok.sh @@ -3,7 +3,7 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart.ks.template "rhel-9.2-microshift-4.${PREVIOUS_MINOR_VERSION}" + prepare_kickstart host1 kickstart.ks.template "rhel-9.4-microshift-4.${PREVIOUS_MINOR_VERSION}" launch_vm host1 } diff --git a/test/scenarios/el93-prel@el94-src@upgrade-ok.sh b/test/scenarios/el93-prel@el94-src@upgrade-ok.sh deleted file mode 100644 index f6df30fbfe..0000000000 --- a/test/scenarios/el93-prel@el94-src@upgrade-ok.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -scenario_create_vms() { - prepare_kickstart host1 kickstart.ks.template "rhel-9.3-microshift-4.${PREVIOUS_MINOR_VERSION}" - 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 -} diff --git a/test/scenarios/el94-crel@el94-src@upgrade-ok.sh.disabled b/test/scenarios/el94-crel@el94-src@upgrade-ok.sh similarity index 100% rename from test/scenarios/el94-crel@el94-src@upgrade-ok.sh.disabled rename to test/scenarios/el94-crel@el94-src@upgrade-ok.sh diff --git a/test/scenarios-upgrades/el92-prel@el94-src@upgrade-ok.sh b/test/scenarios/el94-prel@el94-src@upgrade-ok.sh similarity index 79% rename from test/scenarios-upgrades/el92-prel@el94-src@upgrade-ok.sh rename to test/scenarios/el94-prel@el94-src@upgrade-ok.sh index 1ce5387452..bd1a53ede2 100644 --- a/test/scenarios-upgrades/el92-prel@el94-src@upgrade-ok.sh +++ b/test/scenarios/el94-prel@el94-src@upgrade-ok.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart.ks.template "rhel-9.2-microshift-4.${PREVIOUS_MINOR_VERSION}" - launch_vm host1 rhel-9.2 + prepare_kickstart host1 kickstart.ks.template "rhel-9.4-microshift-4.${PREVIOUS_MINOR_VERSION}" + launch_vm host1 } scenario_remove_vms() {