-
Notifications
You must be signed in to change notification settings - Fork 82
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.
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
Test: implement kargs e2e test #594
Merged
cgwalters
merged 1 commit into
containers:main
from
lukewarmtemp:kargs-integration-test
Jul 18, 2024
Merged
Test: implement kargs e2e test #594
cgwalters
merged 1 commit into
containers:main
from
lukewarmtemp:kargs-integration-test
Jul 18, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@cgwalters @henrywang Sorry, do you guys think you'd be able to help me figure out how to stop the integration tests from skipping? |
Hi! I think we can reuse diff --git i/tests/integration/image-install-upgrade.sh w/tests/integration/image-install-upgrade.sh
index 2468802..bc668bc 100755
--- i/tests/integration/image-install-upgrade.sh
+++ w/tests/integration/image-install-upgrade.sh
@@ -154,7 +154,7 @@ case "$IMAGE_TYPE" in
-v /dev:/dev \
-v .:/output \
"$TEST_IMAGE_URL" \
- bootc install to-disk --filesystem "$ROOTFS" --generic-image --via-loopback /output/disk.raw
+ bootc install to-disk --filesystem "$ROOTFS" --generic-image --via-loopback --karg=nosmt /output/disk.raw
sudo qemu-img convert -f raw ./disk.raw -O qcow2 "/var/lib/libvirt/images/disk.qcow2"
rm -f disk.raw
@@ -194,6 +194,7 @@ ansible-playbook -v \
-e test_os="$TEST_OS" \
-e bootc_image="$TEST_IMAGE_URL" \
-e image_label_version_id="$REDHAT_VERSION_ID" \
+ -e karg="nosmt" \
playbooks/check-system.yaml
greenprint "Create upgrade Containerfile"
diff --git i/tests/integration/playbooks/check-system.yaml w/tests/integration/playbooks/check-system.yaml
index ede5a3a..6a9bae1 100644
--- i/tests/integration/playbooks/check-system.yaml
+++ w/tests/integration/playbooks/check-system.yaml
@@ -4,6 +4,7 @@
vars:
bootc_image: ""
upgrade: ""
+ karg: ""
total_counter: "0"
failed_counter: "0"
@@ -452,6 +453,31 @@
when: ansible_facts['distribution_version'] != "41"
# workaround for issue https://gitlab.com/fedora/bootc/base-images/-/issues/10
+ # case: check karg
+ - name: grep for kargs
+ shell: cat /proc/cmdline | grep {{ karg }}
+ register: kargs_check
+ # grep will exit with 1 when no results found.
+ # This causes the task not to halt play.
+ ignore_errors: true
+ when: karg != ''
+
+ - name: check if kargs exist
+ block:
+ - assert:
+ that:
+ - kargs_check is succeeded
+ fail_msg: install kargs not found
+ success_msg: install kargs found
+ always:
+ - set_fact:
+ total_counter: "{{ total_counter | int + 1 }}"
+ rescue:
+ - name: failed count + 1
+ set_fact:
+ failed_counter: "{{ failed_counter | int + 1 }}"
+ when: karg != ''
+
# case: check reboot times
- name: check reboot times
command: last reboot |
henrywang
reviewed
Jun 11, 2024
lukewarmtemp
force-pushed
the
kargs-integration-test
branch
from
June 12, 2024 14:45
4428baf
to
52063f7
Compare
lukewarmtemp
force-pushed
the
kargs-integration-test
branch
from
June 19, 2024 18:07
5e1ffa4
to
a23f730
Compare
I forgot to mention here that I added kargs tests in b777459 (that said, it makes sense to have some in the e2e tests too) |
lukewarmtemp
force-pushed
the
kargs-integration-test
branch
4 times, most recently
from
July 3, 2024 17:26
1210f17
to
3e2d32c
Compare
lukewarmtemp
force-pushed
the
kargs-integration-test
branch
from
July 8, 2024 14:04
41da374
to
f4c37b9
Compare
Update check-system.yaml to check the kargs in the installed system. Update the install Containerfile with install kargs in `/usr/lib/bootc/install` and day 2 kargs in `/usr/lib/bootc/kargs.d`, checking to see that the kargs are applied in the installed system. Update the upgrade Containerfile with different day 2 kargs, checking to see if the delta is applied properly. Signed-off-by: Luke Yang <[email protected]>
lukewarmtemp
force-pushed
the
kargs-integration-test
branch
from
July 8, 2024 15:09
f4c37b9
to
b66a34f
Compare
cgwalters
approved these changes
Jul 18, 2024
cgwalters
pushed a commit
to cgwalters/bootc
that referenced
this pull request
Nov 5, 2024
…1.0.195 build(deps): bump serde from 1.0.193 to 1.0.195
cgwalters
added a commit
to cgwalters/bootc
that referenced
this pull request
Nov 6, 2024
deploy: Don't enforce container sigpolicy by default, add `--enforce-container-sigpolicy`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Integration test for the changes in: #401