Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions test/bin/manage_build_cache.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does this bucket exist?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only for testing purposes. I need to rebuild cache due to the changes, so I'm targetting a new bucket to not mess up default bucket.

BCH_SUBDIR=
TAG_SUBDIR=

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 13 additions & 0 deletions test/package-sources-bootc/microshift-rt.repo
Original file line number Diff line number Diff line change
@@ -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 -}}
4 changes: 3 additions & 1 deletion test/scenarios-bootc/releases/el96-lrel@low-latency.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion test/suites/tuned/profile.robot
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions test/suites/tuned/uncore-cache.robot
Original file line number Diff line number Diff line change
Expand Up @@ -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