From 9ee9035c29ad7d66bd8c5a22cd573bc62be0e975 Mon Sep 17 00:00:00 2001 From: Justin Cinkelj Date: Sun, 16 Mar 2025 13:19:07 +0100 Subject: [PATCH 1/3] update certificate test Signed-off-by: Justin Cinkelj --- .github/workflows/z_ansible-test.yml | 4 ++-- tests/integration/targets/certificate/tasks/01_normal.yml | 2 ++ .../targets/certificate/tasks/02_ssl_eof_error.yml | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/z_ansible-test.yml b/.github/workflows/z_ansible-test.yml index 042ee1d53..a361ed300 100644 --- a/.github/workflows/z_ansible-test.yml +++ b/.github/workflows/z_ansible-test.yml @@ -63,8 +63,8 @@ jobs: shell: bash run: | [ "$X_GITHUB_SKIP_TEST" == "1" ] && exit 0 - pip install ansible-core~=2.16.0 - ansible-galaxy collection install community.crypto + pip install -U ansible-core # ~=2.16.0 + ansible-galaxy collection install community.general community.crypto --force ansible-galaxy collection list # ${{ env.WORKDIR }} cannot be used in "uses:" - uses: ./work-dir/ansible_collections/scale_computing/hypercore/.github/actions/make-integ-config diff --git a/tests/integration/targets/certificate/tasks/01_normal.yml b/tests/integration/targets/certificate/tasks/01_normal.yml index b4da32063..e9507342c 100644 --- a/tests/integration/targets/certificate/tasks/01_normal.yml +++ b/tests/integration/targets/certificate/tasks/01_normal.yml @@ -12,6 +12,7 @@ community.crypto.get_certificate: host: "{{ sc_host | replace('https://','') | replace('http://','') }}" port: 443 + asn1_base64: True delegate_to: localhost run_once: true register: default_cert_info @@ -59,6 +60,7 @@ community.crypto.get_certificate: host: "{{ sc_host | replace('https://','') | replace('http://','') }}" port: 443 + asn1_base64: True delegate_to: localhost run_once: true register: uploaded_cert_info diff --git a/tests/integration/targets/certificate/tasks/02_ssl_eof_error.yml b/tests/integration/targets/certificate/tasks/02_ssl_eof_error.yml index 4f078c8b9..65bf5b1aa 100644 --- a/tests/integration/targets/certificate/tasks/02_ssl_eof_error.yml +++ b/tests/integration/targets/certificate/tasks/02_ssl_eof_error.yml @@ -81,6 +81,7 @@ community.crypto.get_certificate: host: "{{ sc_host | replace('https://','') | replace('http://','') }}" port: 443 + asn1_base64: True delegate_to: localhost run_once: true register: uploaded_cert_info From 5a25553badd58d6cb266406e3627c045e1c20fe9 Mon Sep 17 00:00:00 2001 From: Justin Cinkelj Date: Sun, 16 Mar 2025 21:22:53 +0100 Subject: [PATCH 2/3] update virtual_disk test Signed-off-by: Justin Cinkelj --- .../targets/virtual_disk/tasks/01_supported.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/integration/targets/virtual_disk/tasks/01_supported.yml b/tests/integration/targets/virtual_disk/tasks/01_supported.yml index 7e8424c1a..3164cf0e9 100644 --- a/tests/integration/targets/virtual_disk/tasks/01_supported.yml +++ b/tests/integration/targets/virtual_disk/tasks/01_supported.yml @@ -31,12 +31,15 @@ ansible.builtin.shell: cmd: | qemu-img create -f raw xlab-ci-test-VD.raw 10M - # HC3 has some problems with very small/empty disk images. + # dd bs=1M count=10 if=/dev/zero of=xlab-ci-test-VD.raw + # HC3 v9.4.21.216168 has some problems with very small/empty qcow2 disk images. # Run mkfs to populate image. + # Update: maybe `qemu-img convert -c` compress option is a problem mkfs.ext4 xlab-ci-test-VD.raw - qemu-img convert -c -O qcow2 xlab-ci-test-VD.raw xlab-ci-test-VD.qcow2 - qemu-img convert -c -O vmdk xlab-ci-test-VD.raw xlab-ci-test-VD.vmdk - register: generated_img + qemu-img convert -O qcow2 xlab-ci-test-VD.raw xlab-ci-test-VD.qcow2 + # Empty vmdk image seems to be OK + # But non-empty image with ext4 filesystem is a problem. + qemu-img create -f vmdk xlab-ci-test-VD.vmdk 10M # ----------------------------------Job------------------------------------------------------------------------ - name: Upload virtual disk file .qcow2 From 6d3a24000fffd3bdb9f4debb07f7367d21eb1b9a Mon Sep 17 00:00:00 2001 From: Justin Cinkelj Date: Mon, 17 Mar 2025 21:47:45 +0100 Subject: [PATCH 3/3] Update time_server test VM with NTP server has now a diffrent IP Signed-off-by: Justin Cinkelj --- tests/integration/targets/time_server/tasks/02_time_server.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/targets/time_server/tasks/02_time_server.yml b/tests/integration/targets/time_server/tasks/02_time_server.yml index e06929993..d813224a9 100644 --- a/tests/integration/targets/time_server/tasks/02_time_server.yml +++ b/tests/integration/targets/time_server/tasks/02_time_server.yml @@ -8,7 +8,7 @@ # We need 2 NTP servers. # Set them up per ci-infra/ntp-chrony/Readme.md. time_server_a: 10.5.11.5 - time_server_b: 10.5.11.7 + time_server_b: 10.5.11.75 actual_uuid: timesource_guid block: