diff --git a/test/image-blueprints/layer1-base/group5/rhel96-brew-ec-with-optionals-fips.toml b/test/image-blueprints/layer1-base/group5/rhel96-brew-ec-with-optionals-fips.toml deleted file mode 100644 index 2e3c223c2f..0000000000 --- a/test/image-blueprints/layer1-base/group5/rhel96-brew-ec-with-optionals-fips.toml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if and (env.Getenv "BREW_EC_RELEASE_VERSION" "") (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-4.{{ .Env.MINOR_VERSION}}-ec-fips" -description = "FIPS-enabled version of rhel-9.6-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION}}-ec" -version = "0.0.1" -modules = [] -groups = [] -distro = "rhel-96" - -# Use the base brewery blueprint as parent -parent = "rhel-9.6-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION}}-ec" - -# Add only FIPS-specific configuration -[[packages]] -name = "crypto-policies-scripts" -version = "*" - -[customizations.kernel] -append = "fips=1" - -[[customizations.files]] -path = "/etc/crypto-policies/config" -data = "FIPS" -{{- end -}} diff --git a/test/image-blueprints/layer1-base/group5/rhel96-brew-rc-with-optionals-fips.toml b/test/image-blueprints/layer1-base/group5/rhel96-brew-rc-with-optionals-fips.toml deleted file mode 100644 index 18fd441189..0000000000 --- a/test/image-blueprints/layer1-base/group5/rhel96-brew-rc-with-optionals-fips.toml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if and (env.Getenv "BREW_RC_RELEASE_VERSION" "") (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-4.{{ .Env.MINOR_VERSION}}-rc-fips" -description = "FIPS-enabled version of rhel-9.6-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION}}-rc" -version = "0.0.1" -modules = [] -groups = [] -distro = "rhel-96" - -# Use the base brewery blueprint as parent -parent = "rhel-9.6-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION}}-rc" - -# Add only FIPS-specific configuration -[[packages]] -name = "crypto-policies-scripts" -version = "*" - -[customizations.kernel] -append = "fips=1" - -[[customizations.files]] -path = "/etc/crypto-policies/config" -data = "FIPS" -{{- end -}} diff --git a/test/image-blueprints/layer1-base/group5/rhel96-brew-zstream-with-optionals-fips.toml b/test/image-blueprints/layer1-base/group5/rhel96-brew-zstream-with-optionals-fips.toml deleted file mode 100644 index 8e40390bf3..0000000000 --- a/test/image-blueprints/layer1-base/group5/rhel96-brew-zstream-with-optionals-fips.toml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if and (env.Getenv "BREW_Y0_RELEASE_VERSION" "") (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-4.{{ .Env.MINOR_VERSION }}-zstream-fips" -description = "FIPS-enabled version of rhel-9.6-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION }}-zstream" -version = "0.0.1" -modules = [] -groups = [] -distro = "rhel-96" - -# Use the base brewery blueprint as parent -parent = "rhel-9.6-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION }}-zstream" - -# Add only FIPS-specific configuration -[[packages]] -name = "crypto-policies-scripts" -version = "*" - -[customizations.kernel] -append = "fips=1" - -[[customizations.files]] -path = "/etc/crypto-policies/config" -data = "FIPS" -{{- end -}} diff --git a/test/scenarios/releases/el96-lrel@fips.sh.disabled b/test/scenarios/releases/el96-lrel@fips.sh.disabled deleted file mode 100644 index 6c20afe2ac..0000000000 --- a/test/scenarios/releases/el96-lrel@fips.sh.disabled +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -start_image="rhel-9.6-microshift-brew-optionals-4.${MINOR_VERSION}-${LATEST_RELEASE_TYPE}-fips" - -check_platform() { - if [[ "${UNAME_M}" =~ aarch64 ]] ; then - record_junit "setup" "scenario_create_vms" "SKIPPED" - exit 0 - fi -} - -scenario_create_vms() { - if ! does_commit_exist "${start_image}"; then - echo "Image '${start_image}' not found - skipping test" - return 0 - fi - - check_platform - - prepare_kickstart host1 kickstart.ks.template "${start_image}" - launch_vm --fips -} - -scenario_remove_vms() { - check_platform - - remove_vm host1 -} - -scenario_run_tests() { - check_platform - - run_tests host1 suites/fips/ -} -