Skip to content

Commit c052e7e

Browse files
authored
Merge pull request #1158 from jichenjc/move_x
move CI to xena
2 parents 6cf1a43 + d29b3e6 commit c052e7e

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ This provider's versions are able to install and manage the following versions o
5656

5757
This provider's versions are able to install Kubernetes to the following versions of OpenStack:
5858

59-
| | Pike | Queens | Rocky | Stein | Train | Ussuri | Victoria | Wallaby |
60-
| ---------------------------------- | ---- | ------ | ----- | ----- | ----- | ------ | -------- | ------- |
61-
| OpenStack Provider v1alpha3 (v0.3) | + | + | + ||||| |
62-
| OpenStack Provider v1alpha4 (v0.4) | + | + | + | + | + | + || |
63-
| OpenStack Provider v1alpha4 (v0.5) | + | + | + | + | + | + || |
64-
| OpenStack Provider v1beta1 | + | + | + | + | + | + |||
59+
| | Pike | Queens | Rocky | Stein | Train | Ussuri | Victoria | Wallaby | Xena |
60+
| ---------------------------------- | ---- | ------ | ----- | ----- | ----- | ------ | -------- | ------- | ---- |
61+
| OpenStack Provider v1alpha3 (v0.3) | + | + | + ||||| | |
62+
| OpenStack Provider v1alpha4 (v0.4) | + | + | + | + | + | + || | |
63+
| OpenStack Provider v1alpha4 (v0.5) | + | + | + | + | + | + || | |
64+
| OpenStack Provider v1beta1 | + | + | + | + | + | + ||||
6565

6666
Test status:
6767

hack/ci/cloud-init/controller.yaml.tpl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,10 @@
130130
source /opt/stack/devstack/openrc admin admin
131131

132132
# Upload the images so we don't have to upload them from Prow
133-
/opt/stack/devstack/tools/upload_image.sh https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/2021-03-27/ubuntu-2004-kube-v1.18.15.qcow2
133+
# Upload cirros image first in order to avoid reach limit of project
134+
# https://docs.openstack.org/glance/latest/admin/quotas.html
134135
/opt/stack/devstack/tools/upload_image.sh https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/cirros/2021-03-27/cirros-0.5.1-x86_64-disk.img
136+
/opt/stack/devstack/tools/upload_image.sh https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/2021-03-27/ubuntu-2004-kube-v1.18.15.qcow2
135137

136138
# Add the controller to its own host aggregate and availability zone
137139
aggregateid=$(openstack aggregate create --zone "${PRIMARY_AZ}" "${PRIMARY_AZ}" -f value -c id)

hack/ci/create_devstack.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ source "${scriptdir}/${RESOURCE_TYPE}.sh"
3030

3131
CLUSTER_NAME=${CLUSTER_NAME:-"capo-e2e"}
3232

33-
OPENSTACK_RELEASE=${OPENSTACK_RELEASE:-"wallaby"}
33+
OPENSTACK_RELEASE=${OPENSTACK_RELEASE:-"xena"}
3434
OPENSTACK_ENABLE_HORIZON=${OPENSTACK_ENABLE_HORIZON:-"false"}
3535

3636
# Devstack will create a provider network using this range

0 commit comments

Comments
 (0)