diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61cde2c9e41..4dfe9cdf6fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,6 +79,4 @@ include: - .gitlab-ci/lint.yml - .gitlab-ci/shellcheck.yml - .gitlab-ci/terraform.yml - - .gitlab-ci/packet.yml - - .gitlab-ci/vagrant.yml - .gitlab-ci/molecule.yml diff --git a/.gitlab-ci/molecule.yml b/.gitlab-ci/molecule.yml index 94e5a5606fb..2959d4a86e9 100644 --- a/.gitlab-ci/molecule.yml +++ b/.gitlab-ci/molecule.yml @@ -1,15 +1,13 @@ --- .molecule: - tags: [c3.small.x86] + tags: + - packet + extends: .testcases only: [/^pr-.*$/] except: ['triggers'] - image: $PIPELINE_IMAGE services: [] stage: deploy-part1 - before_script: - - tests/scripts/rebase.sh - - ./tests/scripts/vagrant_clean.sh script: - ./tests/scripts/molecule_run.sh after_script: @@ -18,6 +16,10 @@ when: always paths: - molecule_logs/ + variables: + ANSIBLE_TIMEOUT: "120" + CI_PLATFORM: packet + SSH_USER: kubespray # CI template for periodic CI jobs # Enabled when PERIODIC_CI_ENABLED var is set @@ -41,13 +43,13 @@ molecule_docker: extends: .molecule script: - ./tests/scripts/molecule_run.sh -i container-engine/cri-dockerd - when: on_success + when: manual molecule_containerd: extends: .molecule script: - ./tests/scripts/molecule_run.sh -i container-engine/containerd - when: on_success + when: manual molecule_cri-o: extends: .molecule @@ -55,7 +57,7 @@ molecule_cri-o: script: - ./tests/scripts/molecule_run.sh -i container-engine/cri-o allow_failure: true - when: on_success + when: manual # Stage 3 container engines don't get as much attention so allow them to fail molecule_kata: diff --git a/roles/bootstrap-os/molecule/default/molecule.yml b/roles/bootstrap-os/molecule/default/molecule.yml index 76e5b7a94ba..2c32ab308a1 100644 --- a/roles/bootstrap-os/molecule/default/molecule.yml +++ b/roles/bootstrap-os/molecule/default/molecule.yml @@ -2,41 +2,14 @@ role_name_check: 1 dependency: name: galaxy -driver: - name: vagrant - provider: - name: libvirt platforms: - name: ubuntu20 - box: generic/ubuntu2004 - cpus: 1 - memory: 512 - provider_options: - driver: kvm - - name: ubuntu22 - box: generic/ubuntu2204 - cpus: 1 - memory: 1024 - provider_options: - driver: kvm - - name: centos7 - box: centos/7 - cpus: 1 - memory: 512 - provider_options: - driver: kvm - - name: almalinux8 - box: almalinux/8 - cpus: 1 - memory: 512 - provider_options: - driver: kvm - - name: debian10 - box: generic/debian10 - cpus: 1 - memory: 512 - provider_options: - driver: kvm + image: quay.io/kubespray/vm-ubuntu-2004:latest + cpus: 2 + memory: 1Gi + ssh_service: + type: NodePort + nodeport_host: 147.75.102.93 provisioner: name: ansible config_options: diff --git a/roles/container-engine/cri-o/molecule/default/molecule.yml b/roles/container-engine/cri-o/molecule/default/molecule.yml index 99d44a3e566..948c19ba953 100644 --- a/roles/container-engine/cri-o/molecule/default/molecule.yml +++ b/roles/container-engine/cri-o/molecule/default/molecule.yml @@ -1,50 +1,14 @@ --- role_name_check: 1 -driver: - name: vagrant - provider: - name: libvirt platforms: - name: ubuntu20 - box: generic/ubuntu2004 + image: quay.io/kubespray/vm-ubuntu-2004:latest cpus: 2 - memory: 1024 + memory: 1Gi groups: - kube_control_plane - kube_node - k8s_cluster - provider_options: - driver: kvm - - name: almalinux8 - box: almalinux/8 - cpus: 2 - memory: 1024 - groups: - - kube_control_plane - - kube_node - - k8s_cluster - provider_options: - driver: kvm - - name: fedora - box: fedora/38-cloud-base - cpus: 2 - memory: 2048 - groups: - - kube_control_plane - - kube_node - - k8s_cluster - provider_options: - driver: kvm - - name: debian10 - box: generic/debian10 - cpus: 2 - memory: 1024 - groups: - - kube_control_plane - - kube_node - - k8s_cluster - provider_options: - driver: kvm provisioner: name: ansible env: