diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a64a18e0..c4c8615e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,6 +35,11 @@ stages: tags: - terraform/openstack +.terraform/gcp: + extends: .base + tags: + - terraform/gcp + init: stage: init @@ -611,7 +616,7 @@ API: .libvirt_integration: stage: test - extends: .terraform/openstack + extends: .terraform/gcp rules: - !reference [.upstream_rules_all, rules] - !reference [.nightly_rules_all, rules] @@ -621,12 +626,13 @@ API: parallel: matrix: - RUNNER: - - rhos-01/centos-stream-8-x86_64 - - rhos-01/rhel-8.7-ga-x86_64 - - rhos-01/rhel-9.1-ga-x86_64 - - rhos-01/rhel-8.8-nightly-x86_64 - - rhos-01/rhel-9.2-nightly-x86_64 - - rhos-01/centos-stream-9-x86_64 + - gcp/centos-stream-8-x86_64 + - gcp/rhel-8.7-ga-x86_64 + - gcp/rhel-9.1-ga-x86_64 + - gcp/rhel-8.8-nightly-x86_64 + - gcp/rhel-9.2-nightly-x86_64 + - gcp/centos-stream-9-x86_64 + INTERNAL_NETWORK: ["true"] libvirt.sh: extends: .libvirt_integration diff --git a/schutzbot/ci_details.sh b/schutzbot/ci_details.sh index bb9e7aed8..cd0ca70ac 100755 --- a/schutzbot/ci_details.sh +++ b/schutzbot/ci_details.sh @@ -42,19 +42,22 @@ echo "List of installed packages:" rpm -qa | sort echo "------------------------------------------------------------------------------" -if rpm --quiet -q python36; then - echo -e "\n FAIL: python36 is installed, see #794 ..." - exit 1 -else - echo -e "\n PASS: python36 not insalled" -fi +# gcp runners don't use cloud-init and some of the images have python36 installed +if [[ "$RUNNER" != *"gcp"* ]];then + if rpm --quiet -q python36; then + echo -e "\n FAIL: python36 is installed, see #794 ..." + exit 1 + else + echo -e "\n PASS: python36 not insalled" + fi -# Ensure cloud-init has completely finished on the instance. This ensures that -# the instance is fully ready to go. -while true; do - if [[ -f /var/lib/cloud/instance/boot-finished ]]; then - break - fi - echo -e "\n🤔 Waiting for cloud-init to finish running..." - sleep 5 -done + # Ensure cloud-init has completely finished on the instance. This ensures that + # the instance is fully ready to go. + while true; do + if [[ -f /var/lib/cloud/instance/boot-finished ]]; then + break + fi + echo -e "\n🤔 Waiting for cloud-init to finish running..." + sleep 5 + done +fi diff --git a/schutzbot/terraform b/schutzbot/terraform index ad83f756b..8e7f4a872 100644 --- a/schutzbot/terraform +++ b/schutzbot/terraform @@ -1 +1 @@ -89fb25d15bc49e1463aec2ba6ea3c32957ab6c4d +460d034f182a6285a0133c86688c7281a28f548b