particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ci: change to rhel 9.6

Browse source
This commit is contained in:
Yi He 2024-11-19 15:47:28 +08:00 • committed by Jakub Rusz
parent d8295ea2ea
commit 867ff9c06e
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/cases/ostree-simplified-installer.sh
View file

@ -39,7 +39,7 @@ do
done
# Prepare service api server config filef
sudo /usr/local/bin/yq -iy '.service_info.diskencryption_clevis |= [{disk_label: "/dev/vda4", reencrypt: true, binding: {pin: "tpm2", config: "{}"}}]' /etc/fdo/aio/configs/serviceinfo_api_server.yml
if [[ "$VERSION_ID" == "9.5" || "$VERSION_ID" == "9" ]]; then
if [[ "$VERSION_ID" == "9.6" || "$VERSION_ID" == "9" ]]; then
# Modify manufacturing server config to process fdo
# guest interface during onboarding
sudo sed -i 's/SerialNumber/MACAddress/g' /etc/fdo/aio/configs/manufacturing_server.yml
@ -622,7 +622,7 @@ manufacturing_server_url="http://${FDO_SERVER_ADDRESS}:8080"
diun_pub_key_insecure="true"
EOF
if [[ "$VERSION_ID" == "9.5" || "$VERSION_ID" == "9" ]]; then
if [[ "$VERSION_ID" == "9.6" || "$VERSION_ID" == "9" ]]; then
tee -a "$BLUEPRINT_FILE" > /dev/null << EOF
di_mfg_string_type_mac_iface="${MFG_GUEST_INT_NAME}"
EOF
@ -807,7 +807,7 @@ manufacturing_server_url="http://${FDO_SERVER_ADDRESS}:8080"
diun_pub_key_hash="${DIUN_PUB_KEY_HASH}"
EOF
if [[ "$VERSION_ID" == "9.5" || "$VERSION_ID" == "9" ]]; then
if [[ "$VERSION_ID" == "9.6" || "$VERSION_ID" == "9" ]]; then
tee -a "$BLUEPRINT_FILE" > /dev/null << EOF
di_mfg_string_type_mac_iface="${MFG_GUEST_INT_NAME}"
EOF
@ -992,7 +992,7 @@ diun_pub_key_root_certs="""
${DIUN_PUB_KEY_ROOT_CERTS}"""
EOF
if [[ "$VERSION_ID" == "9.5" || "$VERSION_ID" == "9" ]]; then
if [[ "$VERSION_ID" == "9.6" || "$VERSION_ID" == "9" ]]; then
tee -a "$BLUEPRINT_FILE" > /dev/null << EOF
di_mfg_string_type_mac_iface="${MFG_GUEST_INT_NAME}"
EOF

2
test/cases/ostree.sh
View file

@ -56,7 +56,7 @@ case "${ID}-${VERSION_ID}" in
BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/"
fi
;;
"rhel-9.5")
"rhel-9.6")
IMAGE_TYPE=edge-commit
OSTREE_REF="rhel/9/${ARCH}/edge"
OS_VARIANT="rhel9-unknown"

12
test/data/ansible/check-minimal.yaml
View file

@ -58,25 +58,25 @@
set_fact:
failed_counter: "{{ failed_counter | int + 1 }}"
- name: add RHEL 9.5 BaseOS repository
- name: add RHEL 9.6 BaseOS repository
yum_repository:
name: baseos
description: RHEL repository
baseurl: "http://{{ download_node }}/rhel-9/nightly/RHEL-9/latest-RHEL-9.5.0/compose/BaseOS/{{ ansible_facts['architecture'] }}/os/"
baseurl: "http://{{ download_node }}/rhel-9/nightly/RHEL-9/latest-RHEL-9.6.0/compose/BaseOS/{{ ansible_facts['architecture'] }}/os/"
gpgcheck: no
file: rhel_repo
become: yes
when: ansible_facts['distribution'] == 'RedHat' and ansible_facts ['distribution_version'] is version('9.5', '==')
when: ansible_facts['distribution'] == 'RedHat' and ansible_facts ['distribution_version'] is version('9.6', '==')
- name: add RHEL 9.5 AppStream repository
- name: add RHEL 9.6 AppStream repository
yum_repository:
name: appstream
description: RHEL repository
baseurl: "http://{{ download_node }}/rhel-9/nightly/RHEL-9/latest-RHEL-9.5.0/compose/AppStream/{{ ansible_facts['architecture'] }}/os/"
baseurl: "http://{{ download_node }}/rhel-9/nightly/RHEL-9/latest-RHEL-9.6.0/compose/AppStream/{{ ansible_facts['architecture'] }}/os/"
gpgcheck: no
file: rhel_repo
become: yes
when: ansible_facts['distribution'] == 'RedHat' and ansible_facts ['distribution_version'] is version('9.5', '==')
when: ansible_facts['distribution'] == 'RedHat' and ansible_facts ['distribution_version'] is version('9.6', '==')
- name: add RHEL 8.10 BaseOS repository
yum_repository: