diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index f37ac4b..297600d 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -88,6 +88,9 @@ jobs: ansible-galaxy collection install \ -r ${{ env.source_directory }}/requirements.yml \ -p /home/runner/collections --force-with-deps + # Install ansible.posix to have the ansible.posix.profile_task callback available + ansible-galaxy collection install ansible.posix \ + -p /home/runner/collections --force-with-deps - name: Install kubevirt.core collection id: install @@ -106,7 +109,6 @@ jobs: - name: Deploy kubevirt if: inputs.ansible_test_targets != '' - shell: bash run: >- ${{ env.source_directory }}/hack/e2e-setup.sh \ -v \ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3f55110..5b1fcd7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,7 +36,7 @@ jobs: - name: Check if tag exists id: exists run: | - EXISTS=$(git tag | grep ${{ steps.version.outputs.VERSION }}) + EXISTS=$(git tag | grep ${{ steps.version.outputs.VERSION }} || true) echo "EXISTS=$EXISTS" >> $GITHUB_OUTPUT - name: Fail if tag exists diff --git a/tests/integration/targets/inventory_kubevirt/runme.sh b/tests/integration/targets/inventory_kubevirt/runme.sh index 93df0e0..d4cb253 100755 --- a/tests/integration/targets/inventory_kubevirt/runme.sh +++ b/tests/integration/targets/inventory_kubevirt/runme.sh @@ -7,7 +7,6 @@ export ANSIBLE_ROLES_PATH="../" USER_CREDENTIALS_DIR=$(pwd) export USER_CREDENTIALS_DIR -{ export ANSIBLE_CALLBACKS_ENABLED=profile_tasks export ANSIBLE_INVENTORY_ENABLED=kubevirt.core.kubevirt,yaml export ANSIBLE_PYTHON_INTERPRETER=auto_silent @@ -21,7 +20,3 @@ ansible-inventory -i test.label.kubevirt.yml -y --list --output label.yml "$@" ansible-inventory -i test.net.kubevirt.yml -y --list --output net.yml "$@" ansible-playbook verify.yml "$@" - -} || { - exit 1 -} diff --git a/tests/integration/targets/kubevirt_vm/runme.sh b/tests/integration/targets/kubevirt_vm/runme.sh index b879f4f..0551a5a 100755 --- a/tests/integration/targets/kubevirt_vm/runme.sh +++ b/tests/integration/targets/kubevirt_vm/runme.sh @@ -2,9 +2,8 @@ set -eux set -o pipefail -{ -export ANSIBLE_CALLBACKS_ENABLED=profile_tasks -export ANSIBLE_INVENTORY_ENABLED=kubevirt.core.kubevirt,yaml +export ANSIBLE_CALLBACKS_ENABLED=ansible.posix.profile_tasks +export ANSIBLE_INVENTORY_ENABLED=kubevirt.core.kubevirt [ -d files ] || mkdir files [ -f files/priv_key ] || (ssh-keygen -t ed25519 -C test@test -f files/priv_key ; ssh-keygen -y -f files/priv_key > files/pub_key) @@ -16,6 +15,3 @@ ansible-inventory -i test.kubevirt.yml -y --list "$@" ansible-playbook verify.yml -i test.kubevirt.yml --private-key=files/priv_key "$@" rm "$HOME/.ssh/known_hosts" -} || { - exit 1 -} diff --git a/tests/integration/targets/kubevirt_vm/verify.yml b/tests/integration/targets/kubevirt_vm/verify.yml index 5332add..efe821a 100644 --- a/tests/integration/targets/kubevirt_vm/verify.yml +++ b/tests/integration/targets/kubevirt_vm/verify.yml @@ -14,7 +14,7 @@ - name: Connect to VM gather_facts: true hosts: default-testvm3 - remote_user: centos + remote_user: cloud-user vars: ansible_python_interpreter: /usr/bin/python3 tasks: diff --git a/tests/integration/targets/kubevirt_vm_info/runme.sh b/tests/integration/targets/kubevirt_vm_info/runme.sh index 820e399..af4a787 100755 --- a/tests/integration/targets/kubevirt_vm_info/runme.sh +++ b/tests/integration/targets/kubevirt_vm_info/runme.sh @@ -2,9 +2,6 @@ set -eux set -o pipefail -{ -export ANSIBLE_CALLBACKS_ENABLED=profile_tasks +export ANSIBLE_CALLBACKS_ENABLED=ansible.posix.profile_tasks + ansible-playbook playbook.yml "$@" -} || { - exit 1 -}