Skip to content

Commit

Permalink
Merge pull request #1524 from tormath1/tormath1/flatcar-stable
Browse files Browse the repository at this point in the history
🌱 ci: bump flatcar to latest major stable
  • Loading branch information
k8s-ci-robot authored Apr 18, 2023
2 parents 777f7d8 + 1cbe68d commit 4f29063
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion hack/ci/cloud-init/controller.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
# https://docs.openstack.org/glance/latest/admin/quotas.html
/opt/stack/devstack/tools/upload_image.sh https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/cirros/2022-12-05/cirros-0.6.1-x86_64-disk.img
/opt/stack/devstack/tools/upload_image.sh https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/2023-01-14/focal-server-cloudimg-amd64.img
/opt/stack/devstack/tools/upload_image.sh https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/flatcar/flatcar-stable-3374.2.5-kube-v1.25.6.img
/opt/stack/devstack/tools/upload_image.sh https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/flatcar/flatcar-stable-3510.2.0-kube-v1.25.8.img

# Add the controller to its own host aggregate and availability zone
aggregateid=$(openstack aggregate create --zone "${PRIMARY_AZ}" "${PRIMARY_AZ}" -f value -c id)
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/data/e2e_conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ variables:
# The default user for SSH connections from bastion to machines
SSH_USER_MACHINE: "ubuntu"
EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true"
OPENSTACK_FLATCAR_IMAGE_NAME: "flatcar-stable-3374.2.5-kube-v1.25.6"
OPENSTACK_FLATCAR_IMAGE_NAME: "flatcar-stable-3510.2.0-kube-v1.25.8"

intervals:
conformance/wait-control-plane: ["30m", "10s"]
Expand Down

0 comments on commit 4f29063

Please sign in to comment.