diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 287674197..99ab8d05d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,6 +90,6 @@ include: - .gitlab-ci/build.yml - .gitlab-ci/lint.yml - .gitlab-ci/terraform.yml - - .gitlab-ci/packet.yml + - .gitlab-ci/kubevirt.yml - .gitlab-ci/vagrant.yml - .gitlab-ci/molecule.yml diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/kubevirt.yml similarity index 93% rename from .gitlab-ci/packet.yml rename to .gitlab-ci/kubevirt.yml index 9282e046e..ceec118ec 100644 --- a/.gitlab-ci/packet.yml +++ b/.gitlab-ci/kubevirt.yml @@ -1,5 +1,5 @@ --- -.packet: +.kubevirt: extends: .job-moderated interruptible: true before_script: @@ -22,7 +22,7 @@ # (currently, a removed job in the target branch breaks the tests, because the # pipeline definition is parsed by gitlab before the rebase.sh script) # CI template for PRs -packet_pr: +pr: stage: deploy-part1 rules: - if: $PR_LABELS =~ /.*ci-short.*/ @@ -32,7 +32,7 @@ packet_pr: when: on_success - when: manual allow_failure: true - extends: .packet + extends: .kubevirt parallel: matrix: - TESTCASE: @@ -53,9 +53,9 @@ packet_pr: - ubuntu24-calico-etcd-datastore # The ubuntu20-calico-all-in-one jobs are meant as early stages to prevent running the full CI if something is horribly broken -packet_ubuntu20-calico-all-in-one: +ubuntu20-calico-all-in-one: stage: deploy-part1 - extends: .packet + extends: .kubevirt variables: TESTCASE: ubuntu20-calico-all-in-one rules: @@ -64,8 +64,8 @@ packet_ubuntu20-calico-all-in-one: - when: manual allow_failure: true -packet_pr_full: - extends: .packet +pr_full: + extends: .kubevirt stage: deploy-extended rules: - if: $PR_LABELS =~ /.*ci-full.*/ @@ -90,8 +90,8 @@ packet_pr_full: # Need an update of the container image to use schema v2 # update: quay.io/kubespray/vm-amazon-linux-2:latest -packet_manual: - extends: packet_pr_full +manual: + extends: pr_full parallel: matrix: - TESTCASE: @@ -100,8 +100,8 @@ packet_manual: - when: manual allow_failure: true -packet_pr_extended: - extends: .packet +pr_extended: + extends: .kubevirt stage: deploy-extended rules: - if: $PR_LABELS =~ /.*(ci-extended|ci-full).*/ @@ -125,12 +125,12 @@ packet_pr_extended: - ubuntu24-calico-all-in-one # Enabled when PERIODIC_CI_ENABLED var is set -packet_periodic: +periodic: only: variables: - $PERIODIC_CI_ENABLED allow_failure: true - extends: .packet + extends: .kubevirt parallel: matrix: - TESTCASE: diff --git a/roles/adduser/molecule/default/molecule.yml b/roles/adduser/molecule/default/molecule.yml index eba7f2a42..a2043268f 100644 --- a/roles/adduser/molecule/default/molecule.yml +++ b/roles/adduser/molecule/default/molecule.yml @@ -14,6 +14,6 @@ provisioner: callbacks_enabled: profile_tasks timeout: 120 playbooks: - create: ../../../../tests/cloud_playbooks/create-packet.yml + create: ../../../../tests/cloud_playbooks/create-kubevirt.yml verifier: name: testinfra diff --git a/roles/bastion-ssh-config/molecule/default/molecule.yml b/roles/bastion-ssh-config/molecule/default/molecule.yml index 4c8485313..5a515626d 100644 --- a/roles/bastion-ssh-config/molecule/default/molecule.yml +++ b/roles/bastion-ssh-config/molecule/default/molecule.yml @@ -22,6 +22,6 @@ provisioner: hosts: bastion-01: playbooks: - create: ../../../../tests/cloud_playbooks/create-packet.yml + create: ../../../../tests/cloud_playbooks/create-kubevirt.yml verifier: name: testinfra diff --git a/roles/bootstrap-os/molecule/default/molecule.yml b/roles/bootstrap-os/molecule/default/molecule.yml index dff5d1e83..bdb3d85a8 100644 --- a/roles/bootstrap-os/molecule/default/molecule.yml +++ b/roles/bootstrap-os/molecule/default/molecule.yml @@ -32,6 +32,6 @@ provisioner: name: foo comment: My test comment playbooks: - create: ../../../../tests/cloud_playbooks/create-packet.yml + create: ../../../../tests/cloud_playbooks/create-kubevirt.yml verifier: name: testinfra diff --git a/roles/container-engine/containerd/molecule/default/molecule.yml b/roles/container-engine/containerd/molecule/default/molecule.yml index e34edf86c..0ad3b7946 100644 --- a/roles/container-engine/containerd/molecule/default/molecule.yml +++ b/roles/container-engine/containerd/molecule/default/molecule.yml @@ -34,6 +34,6 @@ provisioner: callbacks_enabled: profile_tasks timeout: 120 playbooks: - create: ../../../../../tests/cloud_playbooks/create-packet.yml + create: ../../../../../tests/cloud_playbooks/create-kubevirt.yml verifier: name: testinfra diff --git a/roles/container-engine/cri-dockerd/molecule/default/molecule.yml b/roles/container-engine/cri-dockerd/molecule/default/molecule.yml index 21c4c0595..cff276e42 100644 --- a/roles/container-engine/cri-dockerd/molecule/default/molecule.yml +++ b/roles/container-engine/cri-dockerd/molecule/default/molecule.yml @@ -26,6 +26,6 @@ provisioner: all: become: true playbooks: - create: ../../../../../tests/cloud_playbooks/create-packet.yml + create: ../../../../../tests/cloud_playbooks/create-kubevirt.yml verifier: name: testinfra diff --git a/roles/container-engine/cri-o/molecule/default/molecule.yml b/roles/container-engine/cri-o/molecule/default/molecule.yml index 449d5807a..6bbaabf7a 100644 --- a/roles/container-engine/cri-o/molecule/default/molecule.yml +++ b/roles/container-engine/cri-o/molecule/default/molecule.yml @@ -42,6 +42,6 @@ provisioner: callbacks_enabled: profile_tasks timeout: 120 playbooks: - create: ../../../../../tests/cloud_playbooks/create-packet.yml + create: ../../../../../tests/cloud_playbooks/create-kubevirt.yml verifier: name: testinfra diff --git a/tests/Makefile b/tests/Makefile index db66e340c..c90b5c741 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -8,7 +8,7 @@ $(ANSIBLE_INVENTORY): mkdir $@ create-packet: | $(ANSIBLE_INVENTORY) - ansible-playbook cloud_playbooks/create-packet.yml -c local \ + ansible-playbook cloud_playbooks/create-kubevirt.yml -c local \ -e @"files/${CI_JOB_NAME}.yml" delete-packet: ; diff --git a/tests/cloud_playbooks/create-packet.yml b/tests/cloud_playbooks/create-kubevirt.yml similarity index 100% rename from tests/cloud_playbooks/create-packet.yml rename to tests/cloud_playbooks/create-kubevirt.yml