diff --git a/test/bin/manage_build_cache.sh b/test/bin/manage_build_cache.sh index eeb88378ac..fe377a0401 100755 --- a/test/bin/manage_build_cache.sh +++ b/test/bin/manage_build_cache.sh @@ -8,6 +8,7 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source "${SCRIPTDIR}/common.sh" AWS_BUCKET_NAME="${AWS_BUCKET_NAME:-microshift-build-cache}" +AWS_BUCKET_NAME="microshift-build-pr5850-cache-us-west-2" BCH_SUBDIR= TAG_SUBDIR= diff --git a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-ec-with-optional-tuned.containerfile b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-ec-with-optional-tuned.containerfile index a952476851..4131ba7479 100644 --- a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-ec-with-optional-tuned.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-ec-with-optional-tuned.containerfile @@ -2,9 +2,19 @@ # Note: This comment makes templating add a new line before the code FROM localhost/rhel96-bootc-brew-ec-with-optional:latest +# Copy repository configuration for rt kernel +# {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} +COPY ./bootc-images/microshift-rt.repo /etc/yum.repos.d/ +# {{- end }} + # Install low-latency packages RUN dnf install -y microshift-low-latency-{{env.Getenv "BREW_EC_RELEASE_VERSION"}} && \ - dnf clean all +# {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} +dnf install -y kernel-rt && \ +dnf remove -y kernel kernel-core kernel-modules && \ +rm -vf /etc/yum.repos.d/microshift-rt.repo && \ +# {{- end }} +dnf clean all # Enable microshift-tuned service RUN systemctl enable microshift-tuned diff --git a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-rc-with-optional-tuned.containerfile b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-rc-with-optional-tuned.containerfile index 71543a0a71..ad4576452b 100644 --- a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-rc-with-optional-tuned.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-rc-with-optional-tuned.containerfile @@ -2,9 +2,19 @@ # Note: This comment makes templating add a new line before the code FROM localhost/rhel96-bootc-brew-rc-with-optional:latest +# Copy repository configuration for rt kernel +# {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} +COPY ./bootc-images/microshift-rt.repo /etc/yum.repos.d/ +# {{- end }} + # Install low-latency packages RUN dnf install -y microshift-low-latency-{{env.Getenv "BREW_RC_RELEASE_VERSION"}} && \ - dnf clean all +# {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} +dnf install -y kernel-rt && \ +dnf remove -y kernel kernel-core kernel-modules && \ +rm -vf /etc/yum.repos.d/microshift-rt.repo && \ +# {{- end }} +dnf clean all # Enable microshift-tuned service RUN systemctl enable microshift-tuned diff --git a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-zstream-with-optional-tuned.containerfile b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-zstream-with-optional-tuned.containerfile index c9ad4b277d..a58d94eba8 100644 --- a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-zstream-with-optional-tuned.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-zstream-with-optional-tuned.containerfile @@ -2,9 +2,19 @@ # Note: This comment makes templating add a new line before the code FROM localhost/rhel96-bootc-brew-zstream-with-optional:latest +# Copy repository configuration for rt kernel +# {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} +COPY ./bootc-images/microshift-rt.repo /etc/yum.repos.d/ +# {{- end }} + # Install low-latency packages RUN dnf install -y microshift-low-latency-{{env.Getenv "BREW_Y0_RELEASE_VERSION"}} && \ - dnf clean all +# {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} +dnf install -y kernel-rt && \ +dnf remove -y kernel kernel-core kernel-modules && \ +rm -vf /etc/yum.repos.d/microshift-rt.repo && \ +# {{- end }} +dnf clean all # Enable microshift-tuned service RUN systemctl enable microshift-tuned diff --git a/test/package-sources-bootc/microshift-rt.repo b/test/package-sources-bootc/microshift-rt.repo new file mode 100644 index 0000000000..6cefd590e6 --- /dev/null +++ b/test/package-sources-bootc/microshift-rt.repo @@ -0,0 +1,13 @@ +{{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} +[rhel-9-for-x86_64-rt-rpms] +name = Red Hat Enterprise Linux 9 for x86_64 - Real Time (RPMs) +baseurl = https://cdn.redhat.com/content/dist/rhel9/9.6/{{ .Env.UNAME_M }}/rt/os +enabled = 1 +gpgcheck = 1 +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release +sslverify = 1 +sslcacert = /etc/rhsm/ca/redhat-uep.pem +sslclientkey = {{ .Env.SSL_CLIENT_KEY_FILE }} +sslclientcert = {{ .Env.SSL_CLIENT_CERT_FILE }} +skip_if_unavailable = 0 +{{- end -}} diff --git a/test/scenarios-bootc/releases/el96-lrel@low-latency.sh b/test/scenarios-bootc/releases/el96-lrel@low-latency.sh index 575e81e30b..ade84049a1 100644 --- a/test/scenarios-bootc/releases/el96-lrel@low-latency.sh +++ b/test/scenarios-bootc/releases/el96-lrel@low-latency.sh @@ -44,6 +44,8 @@ scenario_run_tests() { run_tests host1 \ --exitonfailure \ + suites/tuned/profile.robot \ suites/tuned/microshift-tuned.robot \ - suites/tuned/workload-partitioning.robot + suites/tuned/workload-partitioning.robot \ + suites/tuned/uncore-cache.robot } diff --git a/test/suites/tuned/profile.robot b/test/suites/tuned/profile.robot index 81d6244fe9..5795d65560 100644 --- a/test/suites/tuned/profile.robot +++ b/test/suites/tuned/profile.robot @@ -26,7 +26,7 @@ X86 64 Should Run RT Kernel ${arch}= Command Should Work uname -m IF "${arch}" == "x86_64" - ${kernel}= Command Should Work sudo grubby --default-kernel + ${kernel}= Command Should Work uname -r Should End With ${kernel} +rt END diff --git a/test/suites/tuned/uncore-cache.robot b/test/suites/tuned/uncore-cache.robot index 7f23269988..d94206516e 100644 --- a/test/suites/tuned/uncore-cache.robot +++ b/test/suites/tuned/uncore-cache.robot @@ -77,10 +77,10 @@ Cleanup CPU State Remove Files ${KUBELET_CPU_STATE_FILE} Check FeatureGates Is Enabled - [Documentation] Skip suite if CoreDNS hosts feature is not available + [Documentation] Skip suite if FeatureGates feature is not available ${config}= Show Config default TRY VAR ${featuregates}= ${config}[apiServer][featureGates] EXCEPT - Skip CoreDNS hosts feature not available in this MicroShift version + Skip FeatureGates feature not available in this MicroShift version END