diff --git a/tests/playbooks/roles/install-docker/tasks/main.yml b/tests/playbooks/roles/install-docker/tasks/main.yml index adbc25fea2..3be993988d 100644 --- a/tests/playbooks/roles/install-docker/tasks/main.yml +++ b/tests/playbooks/roles/install-docker/tasks/main.yml @@ -13,16 +13,16 @@ - software-properties-common - curl -# curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - +# curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add - - name: Add Docker’s official GPG key apt_key: - url: https://download.docker.com/linux/ubuntu/gpg + url: https://download.docker.com/linux/debian/gpg state: present -# add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" +# add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable" - name: Set up the stable repository apt_repository: - repo: 'deb https://download.docker.com/linux/ubuntu {{ hostvars[inventory_hostname].ansible_distribution_release }} stable' + repo: 'deb https://download.docker.com/linux/debian {{ hostvars[inventory_hostname].ansible_distribution_release }} stable' state: present # apt-get update; apt install -y docker-ce= diff --git a/tests/playbooks/roles/install-k3s/defaults/main.yaml b/tests/playbooks/roles/install-k3s/defaults/main.yaml index 26458cc914..71f6a6f37e 100644 --- a/tests/playbooks/roles/install-k3s/defaults/main.yaml +++ b/tests/playbooks/roles/install-k3s/defaults/main.yaml @@ -1,5 +1,5 @@ --- -k3s_release: "v1.23.6+k3s1" +k3s_release: v1.26.1+k3s1 worker_node_count: 1 cluster_token: "9a08jv.c0izixklcxtmnze7" devstack_workdir: "{{ ansible_user_dir }}/devstack" diff --git a/tests/playbooks/test-csi-cinder-e2e.yaml b/tests/playbooks/test-csi-cinder-e2e.yaml index 34ae4c9ec4..08d5d2a368 100644 --- a/tests/playbooks/test-csi-cinder-e2e.yaml +++ b/tests/playbooks/test-csi-cinder-e2e.yaml @@ -20,7 +20,7 @@ - cinder - role: install-k3s worker_node_count: 0 - k3s_release: v1.23.6+k3s1 + k3s_release: v1.26.1+k3s1 - role: install-docker - role: install-docker-registry cert_hosts: ' ["{{ ansible_default_ipv4.address }}"]' diff --git a/tests/playbooks/test-csi-manila-e2e.yaml b/tests/playbooks/test-csi-manila-e2e.yaml index e37cfbd5eb..33d4ed6444 100644 --- a/tests/playbooks/test-csi-manila-e2e.yaml +++ b/tests/playbooks/test-csi-manila-e2e.yaml @@ -19,7 +19,7 @@ - manila - role: install-k3s worker_node_count: 0 - k3s_release: v1.23.6+k3s1 + k3s_release: v1.26.1+k3s1 - role: install-docker - role: install-docker-registry cert_hosts: ' ["{{ ansible_default_ipv4.address }}"]' diff --git a/tests/playbooks/test-occm-e2e.yaml b/tests/playbooks/test-occm-e2e.yaml index 5880ea153d..fbb6d1ecfc 100644 --- a/tests/playbooks/test-occm-e2e.yaml +++ b/tests/playbooks/test-occm-e2e.yaml @@ -21,7 +21,7 @@ - barbican - role: install-k3s worker_node_count: 0 - k3s_release: v1.23.6+k3s1 + k3s_release: v1.26.1+k3s1 - role: install-docker - role: install-docker-registry cert_hosts: ' ["{{ ansible_default_ipv4.address }}"]' diff --git a/tests/scripts/create-gce-vm.sh b/tests/scripts/create-gce-vm.sh index 2eba24e8a7..b5f35cf55c 100755 --- a/tests/scripts/create-gce-vm.sh +++ b/tests/scripts/create-gce-vm.sh @@ -94,7 +94,7 @@ main() { if ! gcloud compute disks describe devstack-${FLAVOR} --zone "${GCP_ZONE}" > /dev/null 2>&1; then gcloud compute disks create devstack-${FLAVOR} \ - --image-project ubuntu-os-cloud --image-family ubuntu-2004-lts \ + --image-project debian-cloud --image-family debian-11 \ --zone "${GCP_ZONE}" fi