Skip to content
This repository has been archived by the owner on May 28, 2024. It is now read-only.

Commit

Permalink
test: update bib-image.sh to support transient root
Browse files Browse the repository at this point in the history
transient root and composefs are only landed on centos-bootc-dev
and fedora-eln images
  • Loading branch information
henrywang committed Feb 21, 2024
1 parent fd08473 commit 9cce48f
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion anaconda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ case "$TEST_OS" in
BOOT_ARGS="uefi,firmware.feature0.name=secure-boot,firmware.feature0.enabled=no"
CUT_DIRS=6
# According to https://github.com/CentOS/centos-bootc-dev/pull/27
# transient root and compsefs are only landed on centos-bootc-dev and fedora-eln images
# transient root and composefs are only landed on centos-bootc-dev and fedora-eln images
TRANSIENT_ROOT="false"
if [[ "$IMAGE_NAME" == "centos-bootc-dev" ]]; then
TRANSIENT_ROOT="true"
Expand Down
10 changes: 10 additions & 0 deletions bib-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ yum_repos:
enabled: true
gpgcheck: false
EOF
TRANSIENT_ROOT="false"
;;
"centos-stream-9")
IMAGE_NAME=${IMAGE_NAME:-"centos-bootc"}
Expand All @@ -64,13 +65,20 @@ EOF
SSH_USER="ec2-user"
REPLACE_CLOUD_USER='RUN sed -i "s/name: cloud-user/name: ec2-user/g" /etc/cloud/cloud.cfg'
fi
# According to https://github.com/CentOS/centos-bootc-dev/pull/27
# transient root and composefs are only landed on centos-bootc-dev and fedora-eln images
TRANSIENT_ROOT="false"
if [[ "$IMAGE_NAME" == "centos-bootc-dev" ]]; then
TRANSIENT_ROOT="true"
fi
;;
"fedora-eln")
IMAGE_NAME="fedora-bootc"
TIER1_IMAGE_URL="quay.io/centos-bootc/${IMAGE_NAME}:eln"
TIER1_IMAGE_URL="${IMAGE_URL-$TIER1_IMAGE_URL}"
SSH_USER="fedora"
ADD_REPO=""
TRANSIENT_ROOT="true"
;;
*)
redprint "Variable TEST_OS has to be defined"
Expand Down Expand Up @@ -215,6 +223,7 @@ greenprint "Run ostree checking test on $PLATFORM instance"
ansible-playbook -v \
-i "$INVENTORY_FILE" \
-e bootc_image="$TEST_IMAGE_URL" \
-e transient_root="$TRANSIENT_ROOT" \
playbooks/check-system.yaml

greenprint "Create upgrade Containerfile"
Expand All @@ -238,6 +247,7 @@ greenprint "Run ostree checking test after upgrade on $PLATFORM instance"
ansible-playbook -v \
-i "$INVENTORY_FILE" \
-e bootc_image="$TEST_IMAGE_URL" \
-e transient_root="$TRANSIENT_ROOT" \
-e upgrade="true" \
playbooks/check-system.yaml

Expand Down
2 changes: 1 addition & 1 deletion os-replace.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ EOF
REPLACE_CLOUD_USER='RUN sed -i "s/name: cloud-user/name: ec2-user/g" /etc/cloud/cloud.cfg'
fi
# According to https://github.com/CentOS/centos-bootc-dev/pull/27
# transient root and compsefs are only landed on centos-bootc-dev and fedora-eln images
# transient root and composefs are only landed on centos-bootc-dev and fedora-eln images
TRANSIENT_ROOT="false"
if [[ "$IMAGE_NAME" == "centos-bootc-dev" ]]; then
TRANSIENT_ROOT="true"
Expand Down

0 comments on commit 9cce48f

Please sign in to comment.