Skip to content

Commit

Permalink
refactor-docker-machine test
Browse files Browse the repository at this point in the history
  • Loading branch information
yankay committed Apr 8, 2024
1 parent 3067e56 commit 83b0300
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 48 deletions.
2 changes: 0 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 10 additions & 8 deletions .gitlab-ci/molecule.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
Expand All @@ -41,21 +43,21 @@ 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
stage: deploy-part2
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:
Expand Down
40 changes: 2 additions & 38 deletions roles/container-engine/cri-o/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down

0 comments on commit 83b0300

Please sign in to comment.