diff --git a/test/bin/build_images.sh b/test/bin/build_images.sh index 51bf37927b..8b7760e9b9 100755 --- a/test/bin/build_images.sh +++ b/test/bin/build_images.sh @@ -124,7 +124,7 @@ get_blueprint_name() { # rhel92-microshift-source -> rhel-9.2 # # The function also supports an explicit parent override directive in the -# blueprint in the following format: '# parent = rhel-9.6-microshift-4.17'. +# blueprint in the following format: '# parent = rhel-9.8-microshift-4.17'. # Note that the directive must be commented out in the blueprint to avoid # composer syntax errors. # diff --git a/test/image-blueprints-bootc/el10/layer5-upgrade/group1/rhel96-bootc.image-bootc b/test/image-blueprints-bootc/el10/layer5-upgrade/group1/rhel96-bootc.image-bootc deleted file mode 120000 index 6d4dd553a7..0000000000 --- a/test/image-blueprints-bootc/el10/layer5-upgrade/group1/rhel96-bootc.image-bootc +++ /dev/null @@ -1 +0,0 @@ -../../../el9/layer1-base/group2/rhel96-bootc.image-bootc \ No newline at end of file diff --git a/test/image-blueprints-bootc/el10/layer5-upgrade/group1/rhel96-test-agent.containerfile b/test/image-blueprints-bootc/el10/layer5-upgrade/group1/rhel96-test-agent.containerfile deleted file mode 120000 index 6f426e19b3..0000000000 --- a/test/image-blueprints-bootc/el10/layer5-upgrade/group1/rhel96-test-agent.containerfile +++ /dev/null @@ -1 +0,0 @@ -../../../el9/layer1-base/group1/rhel96-test-agent.containerfile \ No newline at end of file diff --git a/test/image-blueprints-bootc/el10/layer5-upgrade/group2/rhel96-bootc-prel.containerfile b/test/image-blueprints-bootc/el10/layer5-upgrade/group2/rhel96-bootc-prel.containerfile deleted file mode 120000 index 3f9147cb31..0000000000 --- a/test/image-blueprints-bootc/el10/layer5-upgrade/group2/rhel96-bootc-prel.containerfile +++ /dev/null @@ -1 +0,0 @@ -../../../el9/layer1-base/group2/rhel96-bootc-prel.containerfile \ No newline at end of file diff --git a/test/image-blueprints-bootc/el10/layer5-upgrade/group2/rhel96-bootc-yminus2.containerfile b/test/image-blueprints-bootc/el10/layer5-upgrade/group2/rhel96-bootc-yminus2.containerfile deleted file mode 120000 index a6685fa9fd..0000000000 --- a/test/image-blueprints-bootc/el10/layer5-upgrade/group2/rhel96-bootc-yminus2.containerfile +++ /dev/null @@ -1 +0,0 @@ -../../../el9/layer1-base/group2/rhel96-bootc-yminus2.containerfile \ No newline at end of file diff --git a/test/image-blueprints-bootc/el10/layer5-upgrade/group2/rhel98-bootc-yminus2.containerfile b/test/image-blueprints-bootc/el10/layer5-upgrade/group2/rhel98-bootc-yminus2.containerfile new file mode 120000 index 0000000000..a19f61ba90 --- /dev/null +++ b/test/image-blueprints-bootc/el10/layer5-upgrade/group2/rhel98-bootc-yminus2.containerfile @@ -0,0 +1 @@ +../../../el9/layer1-base/group2/rhel98-bootc-yminus2.containerfile \ No newline at end of file diff --git a/test/image-blueprints-bootc/el9/layer1-base/group1/rhel96-test-agent.containerfile b/test/image-blueprints-bootc/el9/layer1-base/group1/rhel96-test-agent.containerfile deleted file mode 100644 index a872170aa7..0000000000 --- a/test/image-blueprints-bootc/el9/layer1-base/group1/rhel96-test-agent.containerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM registry.redhat.io/rhel9-eus/rhel-9.6-bootc:9.6 - -# Build arguments -ARG USHIFT_RPM_REPO_NAME=microshift-local -ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME - -# Configure the RPM repositories (with EUS enabled) -COPY --chmod=755 ./bootc-images/rpm-repo-config.sh /tmp/rpm-repo-config.sh -RUN /tmp/rpm-repo-config.sh --enable-eus && rm -f /tmp/rpm-repo-config.sh - -# Copy the MicroShift repository contents -COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH - -# Copy repository configuration -COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo /etc/yum.repos.d/ - -# Install the test agent and cleanup -RUN dnf install -y microshift-test-agent pcp pcp-zeroconf && \ - systemctl enable microshift-test-agent pmcd pmlogger && \ - rm -vf /etc/yum.repos.d/microshift-*.repo && \ - rm -rvf $USHIFT_RPM_REPO_PATH && \ - dnf clean all diff --git a/test/image-blueprints-bootc/el9/layer1-base/group2/rhel96-bootc-prel.containerfile b/test/image-blueprints-bootc/el9/layer1-base/group2/rhel96-bootc-prel.containerfile deleted file mode 100644 index c64585b0eb..0000000000 --- a/test/image-blueprints-bootc/el9/layer1-base/group2/rhel96-bootc-prel.containerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM localhost/rhel96-test-agent:latest - -# Copy repository configuration -COPY ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-prel.repo ./bootc-images/microshift-rhocp-y1.repo \ - /etc/yum.repos.d/ - -# Print repository configuration contents. -# Install MicroShift and cleanup. -RUN dnf repoinfo --enabled && \ - dnf install -y firewalld \ - {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") -}} - "{{ . }}-{{ env.Getenv "PREVIOUS_RELEASE_VERSION" }}" \ - {{ end -}} - && \ - systemctl enable microshift && \ - rm -vf /etc/yum.repos.d/microshift-*.repo && \ - dnf clean all - -# Configure firewall -RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \ - firewall-offline-cmd --zone=trusted --add-source=10.42.0.0/16 && \ - firewall-offline-cmd --zone=trusted --add-source=169.254.169.1 && \ - firewall-offline-cmd --zone=trusted --add-source=fd01::/48 && \ - firewall-offline-cmd --zone=public --add-port=80/tcp && \ - firewall-offline-cmd --zone=public --add-port=443/tcp && \ - firewall-offline-cmd --zone=public --add-port=5353/udp && \ - firewall-offline-cmd --zone=public --add-port=6443/tcp && \ - firewall-offline-cmd --zone=public --add-port=30000-32767/tcp && \ - firewall-offline-cmd --zone=public --add-port=30000-32767/udp diff --git a/test/image-blueprints-bootc/el9/layer1-base/group2/rhel96-bootc.image-bootc b/test/image-blueprints-bootc/el9/layer1-base/group2/rhel96-bootc.image-bootc deleted file mode 100644 index d802c92dda..0000000000 --- a/test/image-blueprints-bootc/el9/layer1-base/group2/rhel96-bootc.image-bootc +++ /dev/null @@ -1 +0,0 @@ -registry.redhat.io/rhel9-eus/rhel-9.6-bootc:9.6 \ No newline at end of file diff --git a/test/image-blueprints-bootc/el9/layer1-base/group2/rhel96-bootc-yminus2.containerfile b/test/image-blueprints-bootc/el9/layer1-base/group2/rhel98-bootc-yminus2.containerfile similarity index 96% rename from test/image-blueprints-bootc/el9/layer1-base/group2/rhel96-bootc-yminus2.containerfile rename to test/image-blueprints-bootc/el9/layer1-base/group2/rhel98-bootc-yminus2.containerfile index 77d5d8336f..8f59f67dd5 100644 --- a/test/image-blueprints-bootc/el9/layer1-base/group2/rhel96-bootc-yminus2.containerfile +++ b/test/image-blueprints-bootc/el9/layer1-base/group2/rhel98-bootc-yminus2.containerfile @@ -1,4 +1,4 @@ -FROM localhost/rhel96-test-agent:latest +FROM localhost/rhel98-test-agent:latest # Copy repository configuration COPY ./bootc-images/microshift-fast-datapath-rhel9.repo /bootc-images/microshift-rhocp-y2.repo \ diff --git a/test/image-blueprints-bootc/el9/layer4-release/group1/rhel96-bootc-brew-y1-with-optional.containerfile b/test/image-blueprints-bootc/el9/layer4-release/group1/rhel96-bootc-brew-y1-with-optional.containerfile deleted file mode 100644 index edb1e43b9a..0000000000 --- a/test/image-blueprints-bootc/el9/layer4-release/group1/rhel96-bootc-brew-y1-with-optional.containerfile +++ /dev/null @@ -1,48 +0,0 @@ -# {{- if env.Getenv "BREW_Y1_RELEASE_VERSION" "" -}} -# Note: This comment makes templating add a new line before the code -FROM localhost/rhel96-test-agent:latest - -# Build arguments -ARG USHIFT_RPM_REPO_NAME=microshift-brew -ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME - -# Copy the MicroShift repository contents -COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH - -# Copy repository configuration -COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-rhocp-y1.repo \ - /etc/yum.repos.d/ - -# Print repository configuration contents. -# Install MicroShift, test agent and cleanup. -RUN dnf repoinfo --enabled && \ - dnf install -y firewalld systemd-resolved \ - {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") -}} - "{{ . }}-{{ env.Getenv "BREW_Y1_RELEASE_VERSION" }}" \ - {{ end -}} - {{ range (env.Getenv "MICROSHIFT_Y1_OPTIONAL_RPMS" | strings.Split " ") -}} - "{{ . }}-{{ env.Getenv "BREW_Y1_RELEASE_VERSION" }}" \ - {{ end -}} - {{ if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) -}} - {{ range (env.Getenv "MICROSHIFT_Y1_X86_64_RPMS" | strings.Split " ") -}} - "{{ . }}-{{ env.Getenv "BREW_Y1_RELEASE_VERSION" }}" \ - {{ end -}} - {{ end -}} - && \ - systemctl enable microshift microshift-test-agent && \ - rm -vf /etc/yum.repos.d/microshift-*.repo && \ - rm -rvf $USHIFT_RPM_REPO_PATH && \ - dnf clean all - -# Configure firewall -RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \ - firewall-offline-cmd --zone=trusted --add-source=10.42.0.0/16 && \ - firewall-offline-cmd --zone=trusted --add-source=169.254.169.1 && \ - firewall-offline-cmd --zone=trusted --add-source=fd01::/48 && \ - firewall-offline-cmd --zone=public --add-port=80/tcp && \ - firewall-offline-cmd --zone=public --add-port=443/tcp && \ - firewall-offline-cmd --zone=public --add-port=5353/udp && \ - firewall-offline-cmd --zone=public --add-port=6443/tcp && \ - firewall-offline-cmd --zone=public --add-port=30000-32767/tcp && \ - firewall-offline-cmd --zone=public --add-port=30000-32767/udp -# {{- end -}} diff --git a/test/image-blueprints-bootc/el9/layer4-release/group1/rhel96-bootc-brew-y2-with-optional.containerfile b/test/image-blueprints-bootc/el9/layer4-release/group1/rhel96-bootc-brew-y2-with-optional.containerfile deleted file mode 100644 index ee09a39351..0000000000 --- a/test/image-blueprints-bootc/el9/layer4-release/group1/rhel96-bootc-brew-y2-with-optional.containerfile +++ /dev/null @@ -1,48 +0,0 @@ -# {{- if env.Getenv "BREW_Y2_RELEASE_VERSION" "" -}} -# Note: This comment makes templating add a new line before the code -FROM localhost/rhel96-test-agent:latest - -# Build arguments -ARG USHIFT_RPM_REPO_NAME=microshift-brew -ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME - -# Copy the MicroShift repository contents -COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH - -# Copy repository configuration -COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-rhocp-y2.repo \ - /etc/yum.repos.d/ - -# Print repository configuration contents. -# Install MicroShift, test agent and cleanup. -RUN dnf repoinfo --enabled && \ - dnf install -y firewalld systemd-resolved \ - {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") -}} - "{{ . }}-{{ env.Getenv "BREW_Y2_RELEASE_VERSION" }}" \ - {{ end -}} - {{ range (env.Getenv "MICROSHIFT_Y2_OPTIONAL_RPMS" | strings.Split " ") -}} - "{{ . }}-{{ env.Getenv "BREW_Y2_RELEASE_VERSION" }}" \ - {{ end -}} - {{ if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) -}} - {{ range (env.Getenv "MICROSHIFT_Y2_X86_64_RPMS" | strings.Split " ") -}} - "{{ . }}-{{ env.Getenv "BREW_Y2_RELEASE_VERSION" }}" \ - {{ end -}} - {{ end -}} - && \ - systemctl enable microshift microshift-test-agent && \ - rm -vf /etc/yum.repos.d/microshift-*.repo && \ - rm -rvf $USHIFT_RPM_REPO_PATH && \ - dnf clean all - -# Configure firewall -RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \ - firewall-offline-cmd --zone=trusted --add-source=10.42.0.0/16 && \ - firewall-offline-cmd --zone=trusted --add-source=169.254.169.1 && \ - firewall-offline-cmd --zone=trusted --add-source=fd01::/48 && \ - firewall-offline-cmd --zone=public --add-port=80/tcp && \ - firewall-offline-cmd --zone=public --add-port=443/tcp && \ - firewall-offline-cmd --zone=public --add-port=5353/udp && \ - firewall-offline-cmd --zone=public --add-port=6443/tcp && \ - firewall-offline-cmd --zone=public --add-port=30000-32767/tcp && \ - firewall-offline-cmd --zone=public --add-port=30000-32767/udp -# {{- end -}} diff --git a/test/image-blueprints/layer1-base/group1/rhel96.toml b/test/image-blueprints/layer1-base/group1/rhel96.toml deleted file mode 100644 index 0b2dc21535..0000000000 --- a/test/image-blueprints/layer1-base/group1/rhel96.toml +++ /dev/null @@ -1,27 +0,0 @@ -name = "rhel-9.6" -description = "Basic RHEL 9.6 edge image without MicroShift." -version = "0.0.1" -distro = "rhel-96" -modules = [] -groups = [] - -[[packages]] -name = "microshift-test-agent" -version = "*" - -[[packages]] -name = "iproute-tc" -version = "*" - -[[packages]] -name = "pcp-zeroconf" -version = "*" - -[customizations.services] -enabled = ["microshift-test-agent", "pmcd", "pmlogger"] - -[customizations.firewall] -ports = ["22:tcp"] - -[customizations.firewall.services] -enabled = ["ssh"] diff --git a/test/image-blueprints/layer1-base/group2/rhel96-microshift-yminus2.toml b/test/image-blueprints/layer1-base/group2/rhel98-microshift-yminus2.toml similarity index 86% rename from test/image-blueprints/layer1-base/group2/rhel96-microshift-yminus2.toml rename to test/image-blueprints/layer1-base/group2/rhel98-microshift-yminus2.toml index 0136174360..243782fcd6 100644 --- a/test/image-blueprints/layer1-base/group2/rhel96-microshift-yminus2.toml +++ b/test/image-blueprints/layer1-base/group2/rhel98-microshift-yminus2.toml @@ -1,9 +1,9 @@ -name = "rhel-9.6-microshift-{{ .Env.YMINUS2_MAJOR_VERSION }}.{{ .Env.YMINUS2_MINOR_VERSION }}" -description = "RHEL 9.6 with MicroShift from two minor versions back installed." +name = "rhel-9.8-microshift-{{ .Env.YMINUS2_MAJOR_VERSION }}.{{ .Env.YMINUS2_MINOR_VERSION }}" +description = "RHEL 9.8 with MicroShift from two minor versions back installed." version = "0.0.1" modules = [] groups = [] -distro = "rhel-96" +distro = "rhel-98" {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") }} [[packages]] diff --git a/test/image-blueprints/layer1-base/group3/rhel98-microshift-previous-minor.toml b/test/image-blueprints/layer1-base/group3/rhel98-microshift-previous-minor.toml index ece0f185a5..4c0c5b4a08 100644 --- a/test/image-blueprints/layer1-base/group3/rhel98-microshift-previous-minor.toml +++ b/test/image-blueprints/layer1-base/group3/rhel98-microshift-previous-minor.toml @@ -7,7 +7,7 @@ distro = "rhel-98" # Parent specification directive recognized by test/bin/build_images.sh to be # used with the '--parent' argument of 'osbuild-composer' -# parent = "rhel-9.6-microshift-{{ .Env.YMINUS2_MAJOR_VERSION }}.{{ .Env.YMINUS2_MINOR_VERSION }}" +# parent = "rhel-9.8-microshift-{{ .Env.YMINUS2_MAJOR_VERSION }}.{{ .Env.YMINUS2_MINOR_VERSION }}" {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") }} [[packages]] diff --git a/test/image-blueprints/layer1-base/group4/rhel96.image-installer b/test/image-blueprints/layer1-base/group4/rhel96.image-installer deleted file mode 100644 index df526bc26f..0000000000 --- a/test/image-blueprints/layer1-base/group4/rhel96.image-installer +++ /dev/null @@ -1 +0,0 @@ -rhel-9.6 diff --git a/test/image-blueprints/layer4-release/group1/rhel96-brew-y2-with-optionals.toml b/test/image-blueprints/layer4-release/group1/rhel96-brew-y2-with-optionals.toml deleted file mode 100644 index 434b6f4f95..0000000000 --- a/test/image-blueprints/layer4-release/group1/rhel96-brew-y2-with-optionals.toml +++ /dev/null @@ -1,67 +0,0 @@ -{{- if env.Getenv "BREW_Y2_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.6-microshift-brew-optionals-{{ .Env.YMINUS2_MAJOR_VERSION }}.{{ .Env.YMINUS2_MINOR_VERSION }}-zstream" -description = "A RHEL 9.6 image with already built and released RPMs like EC, RC, or Z-stream release: {{ .Env.BREW_Y2_RELEASE_VERSION }}" -version = "0.0.1" -modules = [] -groups = [] -distro = "rhel-96" - -{{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") }} -[[packages]] -name = "{{ . }}" -version = "{{ env.Getenv "BREW_Y2_RELEASE_VERSION" }}" -{{ end }} - -{{ range (env.Getenv "MICROSHIFT_Y2_OPTIONAL_RPMS" | strings.Split " ") }} -[[packages]] -name = "{{ . }}" -version = "{{ env.Getenv "BREW_Y2_RELEASE_VERSION" }}" -{{ end }} - -{{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} -{{ range (env.Getenv "MICROSHIFT_Y2_X86_64_RPMS" | strings.Split " ") }} -[[packages]] -name = "{{ . }}" -version = "{{ env.Getenv "BREW_Y2_RELEASE_VERSION" }}" -{{ end }} -{{- end }} - -[[packages]] -name = "microshift-test-agent" -version = "*" - -[[packages]] -name = "pcp-zeroconf" -version = "*" - -[customizations.services] -enabled = ["microshift", "microshift-test-agent", "pmcd", "pmlogger"] - -[customizations.firewall] -ports = [ - "22:tcp", - "80:tcp", - "443:tcp", - "5353:udp", - "6443:tcp", - "8889: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", "fd01::/48"] -{{- end -}} diff --git a/test/image-blueprints/layer4-release/group2/rhel96-brew-y1-with-optionals.toml b/test/image-blueprints/layer4-release/group2/rhel96-brew-y1-with-optionals.toml deleted file mode 100644 index 2bc677ee39..0000000000 --- a/test/image-blueprints/layer4-release/group2/rhel96-brew-y1-with-optionals.toml +++ /dev/null @@ -1,71 +0,0 @@ -{{- if env.Getenv "BREW_Y1_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.6-microshift-brew-optionals-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.PREVIOUS_MINOR_VERSION }}-zstream" -description = "A RHEL 9.6 image with already built and released RPMs like EC, RC, or Z-stream release: {{ .Env.BREW_Y1_RELEASE_VERSION }}" -version = "0.0.1" -modules = [] -groups = [] -distro = "rhel-96" - -# Parent specification directive recognized by test/bin/build_images.sh to be -# used with the '--parent' argument of 'osbuild-composer' -# parent = "rhel-9.6-microshift-brew-optionals-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.YMINUS2_MINOR_VERSION }}-zstream" - -{{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") }} -[[packages]] -name = "{{ . }}" -version = "{{ env.Getenv "BREW_Y1_RELEASE_VERSION" }}" -{{ end }} - -{{ range (env.Getenv "MICROSHIFT_Y1_OPTIONAL_RPMS" | strings.Split " ") }} -[[packages]] -name = "{{ . }}" -version = "{{ env.Getenv "BREW_Y1_RELEASE_VERSION" }}" -{{ end }} - -{{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} -{{ range (env.Getenv "MICROSHIFT_Y1_X86_64_RPMS" | strings.Split " ") }} -[[packages]] -name = "{{ . }}" -version = "{{ env.Getenv "BREW_Y1_RELEASE_VERSION" }}" -{{ end }} -{{- end }} - -[[packages]] -name = "microshift-test-agent" -version = "*" - -[[packages]] -name = "pcp-zeroconf" -version = "*" - -[customizations.services] -enabled = ["microshift", "microshift-test-agent", "pmcd", "pmlogger"] - -[customizations.firewall] -ports = [ - "22:tcp", - "80:tcp", - "443:tcp", - "5353:udp", - "6443:tcp", - "8889: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", "fd01::/48"] -{{- end -}} diff --git a/test/image-blueprints/layer4-release/group2/rhel98-brew-y1-with-optionals.toml b/test/image-blueprints/layer4-release/group2/rhel98-brew-y1-with-optionals.toml index 136b566ee0..262d5e02e4 100644 --- a/test/image-blueprints/layer4-release/group2/rhel98-brew-y1-with-optionals.toml +++ b/test/image-blueprints/layer4-release/group2/rhel98-brew-y1-with-optionals.toml @@ -15,6 +15,10 @@ modules = [] groups = [] distro = "rhel-98" +# Parent specification directive recognized by test/bin/build_images.sh to be +# used with the '--parent' argument of 'osbuild-composer' +# parent = "rhel-9.8-microshift-brew-optionals-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.YMINUS2_MINOR_VERSION }}-zstream" + {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") }} [[packages]] name = "{{ . }}" diff --git a/test/image-blueprints/layer4-release/group3/rhel98-brew-lrel-optional.toml b/test/image-blueprints/layer4-release/group3/rhel98-brew-lrel-optional.toml index d35ca71203..3a7d72efcf 100644 --- a/test/image-blueprints/layer4-release/group3/rhel98-brew-lrel-optional.toml +++ b/test/image-blueprints/layer4-release/group3/rhel98-brew-lrel-optional.toml @@ -17,7 +17,7 @@ distro = "rhel-98" # Parent specification directive recognized by test/bin/build_images.sh to be # used with the '--parent' argument of 'osbuild-composer' -# parent = "rhel-9.6-microshift-brew-optionals-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.PREVIOUS_MINOR_VERSION }}-zstream" +# parent = "rhel-9.8-microshift-brew-optionals-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.PREVIOUS_MINOR_VERSION }}-zstream" {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") }} [[packages]] diff --git a/test/image-blueprints/layer4-release/group3/rhel98-brew-nightly-with-optionals.toml b/test/image-blueprints/layer4-release/group3/rhel98-brew-nightly-with-optionals.toml index b7d2f8232e..3236e625d5 100644 --- a/test/image-blueprints/layer4-release/group3/rhel98-brew-nightly-with-optionals.toml +++ b/test/image-blueprints/layer4-release/group3/rhel98-brew-nightly-with-optionals.toml @@ -17,7 +17,7 @@ distro = "rhel-98" # Parent specification directive recognized by test/bin/build_images.sh to be # used with the '--parent' argument of 'osbuild-composer' -# parent = "rhel-9.6-microshift-brew-optionals-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.PREVIOUS_MINOR_VERSION }}-zstream" +# parent = "rhel-9.8-microshift-brew-optionals-{{ .Env.PREVIOUS_MAJOR_VERSION }}.{{ .Env.PREVIOUS_MINOR_VERSION }}-zstream" {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") }} [[packages]] diff --git a/test/scenarios-bootc/el10/periodics/el96-prel@el102-src@upgrade-ostree2bootc-ok.sh.disabled b/test/scenarios-bootc/el10/periodics/el96-prel@el102-src@upgrade-ostree2bootc-ok.sh.disabled deleted file mode 100644 index 8b8529e14e..0000000000 --- a/test/scenarios-bootc/el10/periodics/el96-prel@el102-src@upgrade-ostree2bootc-ok.sh.disabled +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -scenario_create_vms() { - # The y-1 ostree image will be fetched from the cache as it is not built - # as part of the bootc image build procedure - prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-${PREVIOUS_MAJOR_VERSION}.${PREVIOUS_MINOR_VERSION}" - launch_vm rhel-9.6 -} - -scenario_remove_vms() { - remove_vm host1 -} - -scenario_run_tests() { - run_tests host1 \ - --variable "TARGET_REF:rhel102-bootc-source" \ - --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ - suites/upgrade/upgrade-successful.robot -} diff --git a/test/scenarios-bootc/el10/periodics/el96-yminus2@el102-src@upgrade-ostree2bootc-ok.sh b/test/scenarios-bootc/el10/periodics/el98-yminus2@el102-src@upgrade-ostree2bootc-ok.sh similarity index 86% rename from test/scenarios-bootc/el10/periodics/el96-yminus2@el102-src@upgrade-ostree2bootc-ok.sh rename to test/scenarios-bootc/el10/periodics/el98-yminus2@el102-src@upgrade-ostree2bootc-ok.sh index c99dcfd14f..30a2ee1971 100644 --- a/test/scenarios-bootc/el10/periodics/el96-yminus2@el102-src@upgrade-ostree2bootc-ok.sh +++ b/test/scenarios-bootc/el10/periodics/el98-yminus2@el102-src@upgrade-ostree2bootc-ok.sh @@ -5,8 +5,8 @@ scenario_create_vms() { # The y-2 ostree image will be fetched from the cache as it is not built # as part of the bootc image build procedure - prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-${YMINUS2_MAJOR_VERSION}.${YMINUS2_MINOR_VERSION}" - launch_vm rhel-9.6 + prepare_kickstart host1 kickstart.ks.template "rhel-9.8-microshift-${YMINUS2_MAJOR_VERSION}.${YMINUS2_MINOR_VERSION}" + launch_vm rhel-9.8 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/el10/presubmits/el96-prel@el102-src@upgrade-ok.sh.disabled b/test/scenarios-bootc/el10/presubmits/el96-prel@el102-src@upgrade-ok.sh.disabled deleted file mode 100644 index eade074942..0000000000 --- a/test/scenarios-bootc/el10/presubmits/el96-prel@el102-src@upgrade-ok.sh.disabled +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -start_image=rhel96-bootc-prel - -scenario_create_vms() { - exit_if_image_not_found "${start_image}" - - prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm rhel96-bootc -} - -scenario_remove_vms() { - exit_if_image_not_found "${start_image}" - - remove_vm host1 -} - -scenario_run_tests() { - exit_if_image_not_found "${start_image}" - - run_tests host1 \ - --variable "TARGET_REF:rhel102-bootc-source" \ - --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ - suites/upgrade/upgrade-successful.robot -} diff --git a/test/scenarios-bootc/el10/presubmits/el96-yminus2@el102-src@upgrade-ok.sh b/test/scenarios-bootc/el10/presubmits/el98-yminus2@el102-src@upgrade-ok.sh similarity index 80% rename from test/scenarios-bootc/el10/presubmits/el96-yminus2@el102-src@upgrade-ok.sh rename to test/scenarios-bootc/el10/presubmits/el98-yminus2@el102-src@upgrade-ok.sh index 8e19ea7fc0..618f65158a 100644 --- a/test/scenarios-bootc/el10/presubmits/el96-yminus2@el102-src@upgrade-ok.sh +++ b/test/scenarios-bootc/el10/presubmits/el98-yminus2@el102-src@upgrade-ok.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-yminus2 - launch_vm rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-yminus2 + launch_vm rhel98-bootc } scenario_remove_vms() { diff --git a/test/scenarios-bootc/el10/releases/el96-y2@el102-lrel@lvms-standard1.sh b/test/scenarios-bootc/el10/releases/el98-y1@el102-lrel@lvms-standard1.sh similarity index 95% rename from test/scenarios-bootc/el10/releases/el96-y2@el102-lrel@lvms-standard1.sh rename to test/scenarios-bootc/el10/releases/el98-y1@el102-lrel@lvms-standard1.sh index c6985471b7..fa6f2e9e77 100644 --- a/test/scenarios-bootc/el10/releases/el96-y2@el102-lrel@lvms-standard1.sh +++ b/test/scenarios-bootc/el10/releases/el98-y1@el102-lrel@lvms-standard1.sh @@ -6,7 +6,7 @@ # ensure MicroShift is upgraded before running validation tests export TEST_RANDOMIZATION=none -start_image="rhel96-bootc-brew-y2-with-optional" +start_image="rhel98-bootc-brew-y1-with-optional" dest_image="rhel102-bootc-brew-lrel-optional" scenario_create_vms() { @@ -14,7 +14,7 @@ scenario_create_vms() { exit_if_image_not_found "${dest_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm rhel96-bootc --vm_disksize 30 --vm_vcpus 4 + launch_vm rhel98-bootc --vm_disksize 30 --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/el10/releases/el96-y2@el102-lrel@lvms-standard2.sh b/test/scenarios-bootc/el10/releases/el98-y1@el102-lrel@lvms-standard2.sh similarity index 95% rename from test/scenarios-bootc/el10/releases/el96-y2@el102-lrel@lvms-standard2.sh rename to test/scenarios-bootc/el10/releases/el98-y1@el102-lrel@lvms-standard2.sh index a8ad02b2a2..40ee1510c1 100644 --- a/test/scenarios-bootc/el10/releases/el96-y2@el102-lrel@lvms-standard2.sh +++ b/test/scenarios-bootc/el10/releases/el98-y1@el102-lrel@lvms-standard2.sh @@ -6,7 +6,7 @@ # ensure MicroShift is upgraded before running validation tests export TEST_RANDOMIZATION=none -start_image="rhel96-bootc-brew-y2-with-optional" +start_image="rhel98-bootc-brew-y1-with-optional" dest_image="rhel102-bootc-brew-lrel-optional" scenario_create_vms() { @@ -14,7 +14,7 @@ scenario_create_vms() { exit_if_image_not_found "${dest_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm rhel96-bootc --vm_disksize 30 --vm_vcpus 4 + launch_vm rhel98-bootc --vm_disksize 30 --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/el10/releases/el96-y1@el102-lrel@lvms-standard1.sh b/test/scenarios-bootc/el10/releases/el98-y2@el102-lrel@lvms-standard1.sh similarity index 95% rename from test/scenarios-bootc/el10/releases/el96-y1@el102-lrel@lvms-standard1.sh rename to test/scenarios-bootc/el10/releases/el98-y2@el102-lrel@lvms-standard1.sh index 2963a784c4..4904933d54 100644 --- a/test/scenarios-bootc/el10/releases/el96-y1@el102-lrel@lvms-standard1.sh +++ b/test/scenarios-bootc/el10/releases/el98-y2@el102-lrel@lvms-standard1.sh @@ -6,7 +6,7 @@ # ensure MicroShift is upgraded before running validation tests export TEST_RANDOMIZATION=none -start_image="rhel96-bootc-brew-y1-with-optional" +start_image="rhel98-bootc-brew-y2-with-optional" dest_image="rhel102-bootc-brew-lrel-optional" scenario_create_vms() { @@ -14,7 +14,7 @@ scenario_create_vms() { exit_if_image_not_found "${dest_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm rhel96-bootc --vm_disksize 30 --vm_vcpus 4 + launch_vm rhel98-bootc --vm_disksize 30 --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/el10/releases/el96-y1@el102-lrel@lvms-standard2.sh b/test/scenarios-bootc/el10/releases/el98-y2@el102-lrel@lvms-standard2.sh similarity index 95% rename from test/scenarios-bootc/el10/releases/el96-y1@el102-lrel@lvms-standard2.sh rename to test/scenarios-bootc/el10/releases/el98-y2@el102-lrel@lvms-standard2.sh index 5f4f23bb07..e3a88dd656 100644 --- a/test/scenarios-bootc/el10/releases/el96-y1@el102-lrel@lvms-standard2.sh +++ b/test/scenarios-bootc/el10/releases/el98-y2@el102-lrel@lvms-standard2.sh @@ -6,7 +6,7 @@ # ensure MicroShift is upgraded before running validation tests export TEST_RANDOMIZATION=none -start_image="rhel96-bootc-brew-y1-with-optional" +start_image="rhel98-bootc-brew-y2-with-optional" dest_image="rhel102-bootc-brew-lrel-optional" scenario_create_vms() { @@ -14,7 +14,7 @@ scenario_create_vms() { exit_if_image_not_found "${dest_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm rhel96-bootc --vm_disksize 30 --vm_vcpus 4 + launch_vm rhel98-bootc --vm_disksize 30 --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/el9/periodics/el96-prel@el98-src@upgrade-fails-and-rolls-back.sh.disabled b/test/scenarios-bootc/el9/periodics/el96-prel@el98-src@upgrade-fails-and-rolls-back.sh.disabled deleted file mode 100644 index bb1d8b2756..0000000000 --- a/test/scenarios-bootc/el9/periodics/el96-prel@el98-src@upgrade-fails-and-rolls-back.sh.disabled +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-prel - launch_vm rhel96-bootc -} - -scenario_remove_vms() { - remove_vm host1 -} - -scenario_run_tests() { - run_tests host1 \ - --variable "FAILING_REF:rhel98-bootc-source" \ - --variable "REASON:fail_greenboot" \ - --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ - suites/upgrade/upgrade-fails-and-rolls-back.robot -} diff --git a/test/scenarios-bootc/el9/periodics/el96-prel@el98-src@upgrade-ok.sh.disabled b/test/scenarios-bootc/el9/periodics/el96-prel@el98-src@upgrade-ok.sh.disabled deleted file mode 100644 index 749f7fdee4..0000000000 --- a/test/scenarios-bootc/el9/periodics/el96-prel@el98-src@upgrade-ok.sh.disabled +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -start_image=rhel96-bootc-prel - -scenario_create_vms() { - exit_if_image_not_found "${start_image}" - - prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm rhel96-bootc -} - -scenario_remove_vms() { - exit_if_image_not_found "${start_image}" - - remove_vm host1 -} - -scenario_run_tests() { - exit_if_image_not_found "${start_image}" - - run_tests host1 \ - --variable "TARGET_REF:rhel98-bootc-source" \ - --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ - suites/upgrade/upgrade-successful.robot -} diff --git a/test/scenarios-bootc/el9/periodics/el96-prel@el98-src@upgrade-ostree2bootc-ok.sh.disabled b/test/scenarios-bootc/el9/periodics/el96-prel@el98-src@upgrade-ostree2bootc-ok.sh.disabled deleted file mode 100644 index 7b8c47ce76..0000000000 --- a/test/scenarios-bootc/el9/periodics/el96-prel@el98-src@upgrade-ostree2bootc-ok.sh.disabled +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -scenario_create_vms() { - # The y-1 ostree image will be fetched from the cache as it is not built - # as part of the bootc image build procedure - prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-${PREVIOUS_MAJOR_VERSION}.${PREVIOUS_MINOR_VERSION}" - launch_vm rhel-9.6 -} - -scenario_remove_vms() { - remove_vm host1 -} - -scenario_run_tests() { - run_tests host1 \ - --variable "TARGET_REF:rhel98-bootc-source" \ - --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ - suites/upgrade/upgrade-successful.robot -} diff --git a/test/scenarios-bootc/el9/presubmits/el96-yminus2@el98-src@upgrade-ok.sh b/test/scenarios-bootc/el9/periodics/el98-yminus2@el98-src@upgrade-ok.sh similarity index 80% rename from test/scenarios-bootc/el9/presubmits/el96-yminus2@el98-src@upgrade-ok.sh rename to test/scenarios-bootc/el9/periodics/el98-yminus2@el98-src@upgrade-ok.sh index 24ed77d455..84f954d9e6 100644 --- a/test/scenarios-bootc/el9/presubmits/el96-yminus2@el98-src@upgrade-ok.sh +++ b/test/scenarios-bootc/el9/periodics/el98-yminus2@el98-src@upgrade-ok.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-yminus2 - launch_vm rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-yminus2 + launch_vm rhel98-bootc } scenario_remove_vms() { diff --git a/test/scenarios-bootc/el9/periodics/el96-yminus2@el98-src@upgrade-ostree2bootc-ok.sh b/test/scenarios-bootc/el9/periodics/el98-yminus2@el98-src@upgrade-ostree2bootc-ok.sh similarity index 86% rename from test/scenarios-bootc/el9/periodics/el96-yminus2@el98-src@upgrade-ostree2bootc-ok.sh rename to test/scenarios-bootc/el9/periodics/el98-yminus2@el98-src@upgrade-ostree2bootc-ok.sh index 5e00cf45ea..d3d1bdb5da 100644 --- a/test/scenarios-bootc/el9/periodics/el96-yminus2@el98-src@upgrade-ostree2bootc-ok.sh +++ b/test/scenarios-bootc/el9/periodics/el98-yminus2@el98-src@upgrade-ostree2bootc-ok.sh @@ -5,8 +5,8 @@ scenario_create_vms() { # The y-2 ostree image will be fetched from the cache as it is not built # as part of the bootc image build procedure - prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-${YMINUS2_MAJOR_VERSION}.${YMINUS2_MINOR_VERSION}" - launch_vm rhel-9.6 + prepare_kickstart host1 kickstart.ks.template "rhel-9.8-microshift-${YMINUS2_MAJOR_VERSION}.${YMINUS2_MINOR_VERSION}" + launch_vm rhel-9.8 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/el9/presubmits/el96-prel@el98-src@upgrade-ok.sh.disabled b/test/scenarios-bootc/el9/presubmits/el96-prel@el98-src@upgrade-ok.sh.disabled deleted file mode 100644 index 749f7fdee4..0000000000 --- a/test/scenarios-bootc/el9/presubmits/el96-prel@el98-src@upgrade-ok.sh.disabled +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -start_image=rhel96-bootc-prel - -scenario_create_vms() { - exit_if_image_not_found "${start_image}" - - prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm rhel96-bootc -} - -scenario_remove_vms() { - exit_if_image_not_found "${start_image}" - - remove_vm host1 -} - -scenario_run_tests() { - exit_if_image_not_found "${start_image}" - - run_tests host1 \ - --variable "TARGET_REF:rhel98-bootc-source" \ - --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ - suites/upgrade/upgrade-successful.robot -} diff --git a/test/scenarios-bootc/el9/presubmits/el96-yminus2@prel@src@delta-upgrade-ok.sh.disabled b/test/scenarios-bootc/el9/presubmits/el96-yminus2@prel@src@delta-upgrade-ok.sh.disabled deleted file mode 100644 index bbb7176200..0000000000 --- a/test/scenarios-bootc/el9/presubmits/el96-yminus2@prel@src@delta-upgrade-ok.sh.disabled +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-yminus2 - launch_vm rhel96-bootc -} - -scenario_remove_vms() { - remove_vm host1 -} - -scenario_run_tests() { - prepare_static_delta rhel96-bootc-yminus2 rhel96-bootc-prel - apply_static_delta rhel96-bootc-yminus2 rhel96-bootc-prel - - prepare_static_delta rhel96-bootc-prel rhel98-bootc-source - apply_static_delta rhel96-bootc-prel rhel98-bootc-source - - for ref in rhel96-bootc-prel-from-sdelta rhel98-bootc-source-from-sdelta ; do - run_tests host1 \ - --variable "TARGET_REF:${ref}" \ - --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \ - suites/upgrade/upgrade-successful.robot - done -} diff --git a/test/scenarios-bootc/el9/periodics/el96-yminus2@el98-src@upgrade-ok.sh b/test/scenarios-bootc/el9/presubmits/el98-yminus2@el98-src@upgrade-ok.sh similarity index 80% rename from test/scenarios-bootc/el9/periodics/el96-yminus2@el98-src@upgrade-ok.sh rename to test/scenarios-bootc/el9/presubmits/el98-yminus2@el98-src@upgrade-ok.sh index 24ed77d455..84f954d9e6 100644 --- a/test/scenarios-bootc/el9/periodics/el96-yminus2@el98-src@upgrade-ok.sh +++ b/test/scenarios-bootc/el9/presubmits/el98-yminus2@el98-src@upgrade-ok.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-yminus2 - launch_vm rhel96-bootc + prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-yminus2 + launch_vm rhel98-bootc } scenario_remove_vms() { diff --git a/test/scenarios-bootc/el9/releases/el96-y1@el98-lrel@lvms-standard1.sh b/test/scenarios-bootc/el9/releases/el98-y1@el98-lrel@lvms-standard1.sh similarity index 95% rename from test/scenarios-bootc/el9/releases/el96-y1@el98-lrel@lvms-standard1.sh rename to test/scenarios-bootc/el9/releases/el98-y1@el98-lrel@lvms-standard1.sh index fc5b15fbef..bf22cfac28 100644 --- a/test/scenarios-bootc/el9/releases/el96-y1@el98-lrel@lvms-standard1.sh +++ b/test/scenarios-bootc/el9/releases/el98-y1@el98-lrel@lvms-standard1.sh @@ -6,7 +6,7 @@ # ensure MicroShift is upgraded before running validation tests export TEST_RANDOMIZATION=none -start_image="rhel96-bootc-brew-y1-with-optional" +start_image="rhel98-bootc-brew-y1-with-optional" dest_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { @@ -14,7 +14,7 @@ scenario_create_vms() { exit_if_image_not_found "${dest_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm rhel96-bootc --vm_disksize 30 --vm_vcpus 4 + launch_vm rhel98-bootc --vm_disksize 30 --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/el9/releases/el96-y2@el98-lrel@lvms-standard2.sh b/test/scenarios-bootc/el9/releases/el98-y1@el98-lrel@lvms-standard2.sh similarity index 95% rename from test/scenarios-bootc/el9/releases/el96-y2@el98-lrel@lvms-standard2.sh rename to test/scenarios-bootc/el9/releases/el98-y1@el98-lrel@lvms-standard2.sh index 985690dcb0..8da56c1e57 100644 --- a/test/scenarios-bootc/el9/releases/el96-y2@el98-lrel@lvms-standard2.sh +++ b/test/scenarios-bootc/el9/releases/el98-y1@el98-lrel@lvms-standard2.sh @@ -6,7 +6,7 @@ # ensure MicroShift is upgraded before running validation tests export TEST_RANDOMIZATION=none -start_image="rhel96-bootc-brew-y2-with-optional" +start_image="rhel98-bootc-brew-y1-with-optional" dest_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { @@ -14,7 +14,7 @@ scenario_create_vms() { exit_if_image_not_found "${dest_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm rhel96-bootc --vm_disksize 30 --vm_vcpus 4 + launch_vm rhel98-bootc --vm_disksize 30 --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/el9/releases/el96-y2@el98-lrel@lvms-standard1.sh b/test/scenarios-bootc/el9/releases/el98-y2@el98-lrel@lvms-standard1.sh similarity index 95% rename from test/scenarios-bootc/el9/releases/el96-y2@el98-lrel@lvms-standard1.sh rename to test/scenarios-bootc/el9/releases/el98-y2@el98-lrel@lvms-standard1.sh index 28ae952980..6923096134 100644 --- a/test/scenarios-bootc/el9/releases/el96-y2@el98-lrel@lvms-standard1.sh +++ b/test/scenarios-bootc/el9/releases/el98-y2@el98-lrel@lvms-standard1.sh @@ -6,7 +6,7 @@ # ensure MicroShift is upgraded before running validation tests export TEST_RANDOMIZATION=none -start_image="rhel96-bootc-brew-y2-with-optional" +start_image="rhel98-bootc-brew-y2-with-optional" dest_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { @@ -14,7 +14,7 @@ scenario_create_vms() { exit_if_image_not_found "${dest_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm rhel96-bootc --vm_disksize 30 --vm_vcpus 4 + launch_vm rhel98-bootc --vm_disksize 30 --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios-bootc/el9/releases/el96-y1@el98-lrel@lvms-standard2.sh b/test/scenarios-bootc/el9/releases/el98-y2@el98-lrel@lvms-standard2.sh similarity index 95% rename from test/scenarios-bootc/el9/releases/el96-y1@el98-lrel@lvms-standard2.sh rename to test/scenarios-bootc/el9/releases/el98-y2@el98-lrel@lvms-standard2.sh index c81f7e24e5..e6de5628fe 100644 --- a/test/scenarios-bootc/el9/releases/el96-y1@el98-lrel@lvms-standard2.sh +++ b/test/scenarios-bootc/el9/releases/el98-y2@el98-lrel@lvms-standard2.sh @@ -6,7 +6,7 @@ # ensure MicroShift is upgraded before running validation tests export TEST_RANDOMIZATION=none -start_image="rhel96-bootc-brew-y1-with-optional" +start_image="rhel98-bootc-brew-y2-with-optional" dest_image="rhel98-bootc-brew-lrel-optional" scenario_create_vms() { @@ -14,7 +14,7 @@ scenario_create_vms() { exit_if_image_not_found "${dest_image}" prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" - launch_vm rhel96-bootc --vm_disksize 30 --vm_vcpus 4 + launch_vm rhel98-bootc --vm_disksize 30 --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios/periodics/el96-prel@el98-src@upgrade-fails-and-rolls-back.sh.disabled b/test/scenarios/periodics/el96-prel@el98-src@upgrade-fails-and-rolls-back.sh.disabled deleted file mode 100644 index 48c8a11d32..0000000000 --- a/test/scenarios/periodics/el96-prel@el98-src@upgrade-fails-and-rolls-back.sh.disabled +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -scenario_create_vms() { - prepare_kickstart host1 kickstart.ks.template "rhel-9.6-microshift-${PREVIOUS_MAJOR_VERSION}.${PREVIOUS_MINOR_VERSION}" - launch_vm rhel-9.6 -} - -scenario_remove_vms() { - remove_vm host1 -} - -scenario_run_tests() { - run_tests host1 \ - --variable "FAILING_REF:rhel-9.8-microshift-source" \ - --variable "REASON:fail_greenboot" \ - suites/upgrade/upgrade-fails-and-rolls-back.robot -} diff --git a/test/scenarios/periodics/el96-prel@el98-src@upgrade-ok.sh.disabled b/test/scenarios/periodics/el96-prel@el98-src@upgrade-ok.sh.disabled deleted file mode 100644 index 86e72ae722..0000000000 --- a/test/scenarios/periodics/el96-prel@el98-src@upgrade-ok.sh.disabled +++ /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.6-microshift-${PREVIOUS_MAJOR_VERSION}.${PREVIOUS_MINOR_VERSION}" - launch_vm rhel-9.6 -} - -scenario_remove_vms() { - remove_vm host1 -} - -scenario_run_tests() { - run_tests host1 \ - --variable "TARGET_REF:rhel-9.8-microshift-source" \ - suites/upgrade/upgrade-successful.robot -} diff --git a/test/scenarios/periodics/el96-yminus2@el98-src@upgrade-ok.sh b/test/scenarios/periodics/el98-yminus2@el98-src@upgrade-ok.sh similarity index 80% rename from test/scenarios/periodics/el96-yminus2@el98-src@upgrade-ok.sh rename to test/scenarios/periodics/el98-yminus2@el98-src@upgrade-ok.sh index 8bedde9e7c..e7f8a6648a 100644 --- a/test/scenarios/periodics/el96-yminus2@el98-src@upgrade-ok.sh +++ b/test/scenarios/periodics/el98-yminus2@el98-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.6-microshift-${YMINUS2_MAJOR_VERSION}.${YMINUS2_MINOR_VERSION}" - launch_vm rhel-9.6 + prepare_kickstart host1 kickstart.ks.template "rhel-9.8-microshift-${YMINUS2_MAJOR_VERSION}.${YMINUS2_MINOR_VERSION}" + launch_vm rhel-9.8 } scenario_remove_vms() { diff --git a/test/scenarios/presubmits/el96-prel@el98-src@upgrade-ok.sh.disabled b/test/scenarios/presubmits/el96-prel@el98-src@upgrade-ok.sh.disabled deleted file mode 100644 index 86e72ae722..0000000000 --- a/test/scenarios/presubmits/el96-prel@el98-src@upgrade-ok.sh.disabled +++ /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.6-microshift-${PREVIOUS_MAJOR_VERSION}.${PREVIOUS_MINOR_VERSION}" - launch_vm rhel-9.6 -} - -scenario_remove_vms() { - remove_vm host1 -} - -scenario_run_tests() { - run_tests host1 \ - --variable "TARGET_REF:rhel-9.8-microshift-source" \ - suites/upgrade/upgrade-successful.robot -} diff --git a/test/scenarios/presubmits/el96-yminus2@el98-src@upgrade-ok.sh b/test/scenarios/presubmits/el98-yminus2@el98-src@upgrade-ok.sh similarity index 80% rename from test/scenarios/presubmits/el96-yminus2@el98-src@upgrade-ok.sh rename to test/scenarios/presubmits/el98-yminus2@el98-src@upgrade-ok.sh index 8bedde9e7c..e7f8a6648a 100644 --- a/test/scenarios/presubmits/el96-yminus2@el98-src@upgrade-ok.sh +++ b/test/scenarios/presubmits/el98-yminus2@el98-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.6-microshift-${YMINUS2_MAJOR_VERSION}.${YMINUS2_MINOR_VERSION}" - launch_vm rhel-9.6 + prepare_kickstart host1 kickstart.ks.template "rhel-9.8-microshift-${YMINUS2_MAJOR_VERSION}.${YMINUS2_MINOR_VERSION}" + launch_vm rhel-9.8 } scenario_remove_vms() { diff --git a/test/scenarios/releases/el96-yminus1@el98-lrel@lvms-standard1.sh b/test/scenarios/releases/el98-yminus1@el98-lrel@lvms-standard1.sh similarity index 94% rename from test/scenarios/releases/el96-yminus1@el98-lrel@lvms-standard1.sh rename to test/scenarios/releases/el98-yminus1@el98-lrel@lvms-standard1.sh index c1dc026ab4..912f72621a 100644 --- a/test/scenarios/releases/el96-yminus1@el98-lrel@lvms-standard1.sh +++ b/test/scenarios/releases/el98-yminus1@el98-lrel@lvms-standard1.sh @@ -6,7 +6,7 @@ # ensure MicroShift is upgraded before running validation tests export TEST_RANDOMIZATION=none -start_image="rhel-9.6-microshift-brew-optionals-${PREVIOUS_MAJOR_VERSION}.${PREVIOUS_MINOR_VERSION}-zstream" +start_image="rhel-9.8-microshift-brew-optionals-${PREVIOUS_MAJOR_VERSION}.${PREVIOUS_MINOR_VERSION}-zstream" dest_image="rhel98-brew-lrel-optional" scenario_create_vms() { @@ -14,7 +14,7 @@ scenario_create_vms() { exit_if_commit_not_found "${dest_image}" prepare_kickstart host1 kickstart.ks.template "${start_image}" - launch_vm rhel-9.6 --vm_disksize 30 --vm_vcpus 4 + launch_vm rhel-9.8 --vm_disksize 30 --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios/releases/el96-yminus1@el98-lrel@lvms-standard2.sh b/test/scenarios/releases/el98-yminus1@el98-lrel@lvms-standard2.sh similarity index 94% rename from test/scenarios/releases/el96-yminus1@el98-lrel@lvms-standard2.sh rename to test/scenarios/releases/el98-yminus1@el98-lrel@lvms-standard2.sh index 6cfcdfa1dd..eef2d6a799 100644 --- a/test/scenarios/releases/el96-yminus1@el98-lrel@lvms-standard2.sh +++ b/test/scenarios/releases/el98-yminus1@el98-lrel@lvms-standard2.sh @@ -6,7 +6,7 @@ # ensure MicroShift is upgraded before running validation tests export TEST_RANDOMIZATION=none -start_image="rhel-9.6-microshift-brew-optionals-${PREVIOUS_MAJOR_VERSION}.${PREVIOUS_MINOR_VERSION}-zstream" +start_image="rhel-9.8-microshift-brew-optionals-${PREVIOUS_MAJOR_VERSION}.${PREVIOUS_MINOR_VERSION}-zstream" dest_image="rhel98-brew-lrel-optional" scenario_create_vms() { @@ -14,7 +14,7 @@ scenario_create_vms() { exit_if_commit_not_found "${dest_image}" prepare_kickstart host1 kickstart.ks.template "${start_image}" - launch_vm rhel-9.6 --vm_disksize 30 --vm_vcpus 4 + launch_vm rhel-9.8 --vm_disksize 30 --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios/releases/el96-yminus2@el98-lrel@lvms-standard1.sh b/test/scenarios/releases/el98-yminus2@el98-lrel@lvms-standard1.sh similarity index 93% rename from test/scenarios/releases/el96-yminus2@el98-lrel@lvms-standard1.sh rename to test/scenarios/releases/el98-yminus2@el98-lrel@lvms-standard1.sh index 6b6b08077c..443063137d 100644 --- a/test/scenarios/releases/el96-yminus2@el98-lrel@lvms-standard1.sh +++ b/test/scenarios/releases/el98-yminus2@el98-lrel@lvms-standard1.sh @@ -6,7 +6,7 @@ # ensure MicroShift is upgraded before running validation tests export TEST_RANDOMIZATION=none -start_image="rhel-9.6-microshift-brew-optionals-${PREVIOUS_MAJOR_VERSION}.${YMINUS2_MINOR_VERSION}-zstream" +start_image="rhel-9.8-microshift-brew-optionals-${YMINUS2_MAJOR_VERSION}.${YMINUS2_MINOR_VERSION}-zstream" dest_image="rhel98-brew-lrel-optional" scenario_create_vms() { @@ -14,7 +14,7 @@ scenario_create_vms() { exit_if_commit_not_found "${dest_image}" prepare_kickstart host1 kickstart.ks.template "${start_image}" - launch_vm rhel-9.6 --vm_disksize 30 --vm_vcpus 4 + launch_vm rhel-9.8 --vm_disksize 30 --vm_vcpus 4 } scenario_remove_vms() { diff --git a/test/scenarios/releases/el96-yminus2@el98-lrel@lvms-standard2.sh b/test/scenarios/releases/el98-yminus2@el98-lrel@lvms-standard2.sh similarity index 92% rename from test/scenarios/releases/el96-yminus2@el98-lrel@lvms-standard2.sh rename to test/scenarios/releases/el98-yminus2@el98-lrel@lvms-standard2.sh index 5eefb72167..50eab6ec95 100644 --- a/test/scenarios/releases/el96-yminus2@el98-lrel@lvms-standard2.sh +++ b/test/scenarios/releases/el98-yminus2@el98-lrel@lvms-standard2.sh @@ -6,7 +6,7 @@ # ensure MicroShift is upgraded before running validation tests export TEST_RANDOMIZATION=none -start_image="rhel-9.6-microshift-brew-optionals-${PREVIOUS_MAJOR_VERSION}.${YMINUS2_MINOR_VERSION}-zstream" +start_image="rhel-9.8-microshift-brew-optionals-${YMINUS2_MAJOR_VERSION}.${YMINUS2_MINOR_VERSION}-zstream" dest_image="rhel98-brew-lrel-optional" scenario_create_vms() { @@ -14,7 +14,7 @@ scenario_create_vms() { exit_if_commit_not_found "${dest_image}" prepare_kickstart host1 kickstart.ks.template "${start_image}" - launch_vm rhel-9.6 --vm_disksize 30 --vm_vcpus 4 + launch_vm rhel-9.8 --vm_disksize 30 --vm_vcpus 4 } scenario_remove_vms() {