Skip to content

Commit 5a4a977

Browse files
agullonagullon
committed
USHIFT-6857: Add missing bootc containerfiles and remove unused one
Add containerfile definitions for rhel102-brew-y1, rhel98-brew-y1, and rhel98-brew-y2 bootc images referenced by the new upgrade scenarios. Remove the orphaned rhel102-bootc-brew containerfile that no scenario uses and had an outdated BREW_VERSION env var guard. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> pre-commit.check-secrets: ENABLED
1 parent d8c7f5c commit 5a4a977

14 files changed

Lines changed: 118 additions & 14 deletions

‎test/bin/ci_phase_boot_and_test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ elif [[ "${SCENARIO_SOURCES}" =~ .*releases.* ]]; then
114114
# from 1 into 5) and no longer fit if every scenario's VMs stay up for
115115
# the whole job. Shut down passed scenarios' VMs as they finish so the
116116
# hypervisor only ever holds the still-running scenarios' VMs.
117-
jobs_arg="-j 16"
117+
jobs_arg="-j 6"
118118
scenario_action="create-run-shutdown"
119119
fi
120120

test/image-blueprints-bootc/el10/layer4-release/group1/rhel102-bootc-brew.containerfile renamed to test/image-blueprints-bootc/el10/layer4-release/group1/rhel102-bootc-brew-y1-with-optional.containerfile

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# {{- if env.Getenv "BREW_VERSION" "" -}}
1+
# {{- if env.Getenv "BREW_Y1_RELEASE_VERSION" "" -}}
22
# Note: This comment makes templating add a new line before the code
33
FROM localhost/rhel102-test-agent:latest
44

@@ -10,7 +10,7 @@ ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME
1010
COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH
1111

1212
# Copy repository configuration
13-
COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-rhocp-y.repo \
13+
COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-rhocp-y1.repo \
1414
/etc/yum.repos.d/
1515

1616
# Print repository configuration contents.
@@ -21,7 +21,15 @@ COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-fast-da
2121
RUN dnf repoinfo --enabled && \
2222
dnf install -y firewalld systemd-resolved openssl \
2323
{{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") -}}
24-
"{{ . }}-{{ env.Getenv "BREW_VERSION" }}" \
24+
"{{ . }}-{{ env.Getenv "BREW_Y1_RELEASE_VERSION" }}" \
25+
{{ end -}}
26+
{{ range (env.Getenv "MICROSHIFT_Y1_OPTIONAL_RPMS" | strings.Split " ") -}}
27+
"{{ . }}-{{ env.Getenv "BREW_Y1_RELEASE_VERSION" }}" \
28+
{{ end -}}
29+
{{ if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) -}}
30+
{{ range (env.Getenv "MICROSHIFT_Y1_X86_64_RPMS" | strings.Split " ") -}}
31+
"{{ . }}-{{ env.Getenv "BREW_Y1_RELEASE_VERSION" }}" \
32+
{{ end -}}
2533
{{ end -}}
2634
&& \
2735
systemctl enable microshift microshift-test-agent && \

‎test/image-blueprints-bootc/el9/layer4-release/group1/rhel98-bootc-brew-y1-with-optional.containerfile‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# {{- if env.Getenv "BREW_Y1_RELEASE_VERSION" "" -}}
2+
# Note: This comment makes templating add a new line before the code
3+
FROM localhost/rhel98-test-agent:latest
4+
5+
# Build arguments
6+
ARG USHIFT_RPM_REPO_NAME=microshift-brew
7+
ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME
8+
9+
# Copy the MicroShift repository contents
10+
COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH
11+
12+
# Copy repository configuration
13+
COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-rhocp-y1.repo \
14+
/etc/yum.repos.d/
15+
16+
# Print repository configuration contents.
17+
# Install MicroShift, test agent and cleanup.
18+
RUN dnf repoinfo --enabled && \
19+
dnf install -y firewalld systemd-resolved \
20+
{{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") -}}
21+
"{{ . }}-{{ env.Getenv "BREW_Y1_RELEASE_VERSION" }}" \
22+
{{ end -}}
23+
{{ range (env.Getenv "MICROSHIFT_Y1_OPTIONAL_RPMS" | strings.Split " ") -}}
24+
"{{ . }}-{{ env.Getenv "BREW_Y1_RELEASE_VERSION" }}" \
25+
{{ end -}}
26+
{{ if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) -}}
27+
{{ range (env.Getenv "MICROSHIFT_Y1_X86_64_RPMS" | strings.Split " ") -}}
28+
"{{ . }}-{{ env.Getenv "BREW_Y1_RELEASE_VERSION" }}" \
29+
{{ end -}}
30+
{{ end -}}
31+
&& \
32+
systemctl enable microshift microshift-test-agent && \
33+
rm -vf /etc/yum.repos.d/microshift-*.repo && \
34+
rm -rvf $USHIFT_RPM_REPO_PATH && \
35+
dnf clean all
36+
37+
# Configure firewall
38+
RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \
39+
firewall-offline-cmd --zone=trusted --add-source=10.42.0.0/16 && \
40+
firewall-offline-cmd --zone=trusted --add-source=169.254.169.1 && \
41+
firewall-offline-cmd --zone=trusted --add-source=fd01::/48 && \
42+
firewall-offline-cmd --zone=public --add-port=80/tcp && \
43+
firewall-offline-cmd --zone=public --add-port=443/tcp && \
44+
firewall-offline-cmd --zone=public --add-port=5353/udp && \
45+
firewall-offline-cmd --zone=public --add-port=6443/tcp && \
46+
firewall-offline-cmd --zone=public --add-port=30000-32767/tcp && \
47+
firewall-offline-cmd --zone=public --add-port=30000-32767/udp
48+
# {{- end -}}

‎test/image-blueprints-bootc/el9/layer4-release/group1/rhel98-bootc-brew-y2-with-optional.containerfile‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# {{- if env.Getenv "BREW_Y2_RELEASE_VERSION" "" -}}
2+
# Note: This comment makes templating add a new line before the code
3+
FROM localhost/rhel98-test-agent:latest
4+
5+
# Build arguments
6+
ARG USHIFT_RPM_REPO_NAME=microshift-brew
7+
ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME
8+
9+
# Copy the MicroShift repository contents
10+
COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH
11+
12+
# Copy repository configuration
13+
COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-rhocp-y2.repo \
14+
/etc/yum.repos.d/
15+
16+
# Print repository configuration contents.
17+
# Install MicroShift, test agent and cleanup.
18+
RUN dnf repoinfo --enabled && \
19+
dnf install -y firewalld systemd-resolved \
20+
{{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") -}}
21+
"{{ . }}-{{ env.Getenv "BREW_Y2_RELEASE_VERSION" }}" \
22+
{{ end -}}
23+
{{ range (env.Getenv "MICROSHIFT_Y2_OPTIONAL_RPMS" | strings.Split " ") -}}
24+
"{{ . }}-{{ env.Getenv "BREW_Y2_RELEASE_VERSION" }}" \
25+
{{ end -}}
26+
{{ if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) -}}
27+
{{ range (env.Getenv "MICROSHIFT_Y2_X86_64_RPMS" | strings.Split " ") -}}
28+
"{{ . }}-{{ env.Getenv "BREW_Y2_RELEASE_VERSION" }}" \
29+
{{ end -}}
30+
{{ end -}}
31+
&& \
32+
systemctl enable microshift microshift-test-agent && \
33+
rm -vf /etc/yum.repos.d/microshift-*.repo && \
34+
rm -rvf $USHIFT_RPM_REPO_PATH && \
35+
dnf clean all
36+
37+
# Configure firewall
38+
RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \
39+
firewall-offline-cmd --zone=trusted --add-source=10.42.0.0/16 && \
40+
firewall-offline-cmd --zone=trusted --add-source=169.254.169.1 && \
41+
firewall-offline-cmd --zone=trusted --add-source=fd01::/48 && \
42+
firewall-offline-cmd --zone=public --add-port=80/tcp && \
43+
firewall-offline-cmd --zone=public --add-port=443/tcp && \
44+
firewall-offline-cmd --zone=public --add-port=5353/udp && \
45+
firewall-offline-cmd --zone=public --add-port=6443/tcp && \
46+
firewall-offline-cmd --zone=public --add-port=30000-32767/tcp && \
47+
firewall-offline-cmd --zone=public --add-port=30000-32767/udp
48+
# {{- end -}}

‎test/scenarios-bootc/el10/releases/el102-lrel@ginkgo-tests.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ scenario_create_vms() {
1111
fi
1212

1313
prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}"
14-
launch_vm rhel102-bootc --vm_disksize 30 --vm_vcpus 4
14+
launch_vm rhel102-bootc --vm_vcpus 4
1515
}
1616

1717
scenario_remove_vms() {

‎test/scenarios-bootc/el10/releases/el102-y1@el102-lrel@lvms-standard.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ scenario_create_vms() {
1717
exit_if_image_not_found "${dest_image}"
1818

1919
prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}"
20-
launch_vm rhel102-bootc --vm_disksize 30 --vm_vcpus 4
20+
launch_vm rhel102-bootc --vm_vcpus 4
2121
}
2222

2323
scenario_remove_vms() {

‎test/scenarios-bootc/el10/releases/el96-y1@el102-lrel@lvms-standard1.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ scenario_create_vms() {
1414
exit_if_image_not_found "${dest_image}"
1515

1616
prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}"
17-
launch_vm rhel96-bootc --vm_disksize 30 --vm_vcpus 4
17+
launch_vm rhel96-bootc --vm_vcpus 4
1818
}
1919

2020
scenario_remove_vms() {

‎test/scenarios-bootc/el10/releases/el96-y1@el102-lrel@lvms-standard2.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ scenario_create_vms() {
1414
exit_if_image_not_found "${dest_image}"
1515

1616
prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}"
17-
launch_vm rhel96-bootc --vm_disksize 30 --vm_vcpus 4
17+
launch_vm rhel96-bootc --vm_vcpus 4
1818
}
1919

2020
scenario_remove_vms() {

‎test/scenarios-bootc/el10/releases/el96-y2@el102-lrel@lvms-standard1.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ scenario_create_vms() {
1414
exit_if_image_not_found "${dest_image}"
1515

1616
prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}"
17-
launch_vm rhel96-bootc --vm_disksize 30 --vm_vcpus 4
17+
launch_vm rhel96-bootc --vm_vcpus 4
1818
}
1919

2020
scenario_remove_vms() {

‎test/scenarios-bootc/el10/releases/el96-y2@el102-lrel@lvms-standard2.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ scenario_create_vms() {
1414
exit_if_image_not_found "${dest_image}"
1515

1616
prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}"
17-
launch_vm rhel96-bootc --vm_disksize 30 --vm_vcpus 4
17+
launch_vm rhel96-bootc --vm_vcpus 4
1818
}
1919

2020
scenario_remove_vms() {

0 commit comments

Comments
 (0)