Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump rhel4edge to 9.2 #5025

Merged
merged 2 commits into from
Jul 19, 2023
Merged

Bump rhel4edge to 9.2 #5025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3dc9b3
Bump rhel4edge to 9.2
marusak Jul 19, 2023
dea3fa1
images: Update rhel4edge image
Jul 19, 2023
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: 0 additions & 1 deletion image-create
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ class MachineBuilder:
ssh_port=self.machine.ssh_port,
identity_file=self.machine.identity_file)
admin_s.wait_boot(timeout_sec=120)
admin_s.execute("sudo mkdir -m 700 /root/.ssh")
with open(DEFAULT_IDENTITY_PUB_FILE) as pub:
admin_s.execute(f"echo '{pub.read().strip()}' | sudo tee -a /root/.ssh/authorized_keys")

Expand Down
2 changes: 1 addition & 1 deletion images/rhel4edge
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rhel4edge-c6c01b2c046dd80fefceb278a5e6b10b0376a31bf2f6a25b4486b2a500443d86.qcow2
rhel4edge-8c2173ad98fb001595b1fbbd3af4b0b20fc32d4c9e261134ee4baeb4031423cb.qcow2
2 changes: 1 addition & 1 deletion images/scripts/rhel4edge.bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ timestamp=$(date +%s)
cat > edge-request.json <<EOF
{
"name": "rhel4edge-$timestamp",
"distribution": "rhel-91",
"distribution": "rhel-92",
"imageType": "rhel-edge-installer",
"packages": [
{ "name": "cockpit-system" },
Expand Down
2 changes: 1 addition & 1 deletion images/scripts/virt-install-rhel4edge
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ cleanup_builder_vm

supervised_virt_install $connect \
--name=$name \
--extra-args="inst.ks=hd:LABEL=RHEL-9-1-0-BaseOS-x86_64:/fleet.ks console=ttyS0,115200" \
--extra-args="inst.stage2=hd:LABEL=RHEL-9-2-0-BaseOS-x86_64 inst.ks=hd:LABEL=RHEL-9-2-0-BaseOS-x86_64:/fleet.ks console=ttyS0,115200" \
--disk "path=$out,format=qcow2" \
--ram 4096 \
--vcpus=1 \
Expand Down
2 changes: 1 addition & 1 deletion lib/testmap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ def contexts(image, *scenarios: Iterable[str]):
# their non-Atomic siblings.
OSTREE_BUILD_IMAGE = {
"fedora-coreos": "fedora-38",
"rhel4edge": "rhel-9-0",
"rhel4edge": "rhel-9-2",
}

# only put auxiliary images here; triggers for primary OS images are computed from testmap
Expand Down