Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🏃 Bump zuul jobs to k8s 1.20 #780

Closed
wants to merge 2 commits into from
Closed

🏃 Bump zuul jobs to k8s 1.20 #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1232bd6
Bump zuul jobs to k8s 1.20
stmcginnis Mar 11, 2021
88d50b5
Update default k8s version in e2e-conformance
stmcginnis Mar 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .zuul.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
name: kubernetes-sigs/cluster-api-provider-openstack
check:
jobs:
- cluster-api-provider-openstack-current-acceptance-test-v1.19-1
- cluster-api-provider-openstack-current-acceptance-test-v1.19-2
- cluster-api-provider-openstack-current-acceptance-test-v1.19-3
- cluster-api-provider-openstack-current-acceptance-test-v1.20-1
- cluster-api-provider-openstack-current-acceptance-test-v1.20-2
- cluster-api-provider-openstack-current-acceptance-test-v1.20-3

- job:
name: cluster-api-provider-openstack-conformance-pr
Expand All @@ -21,33 +21,33 @@
extra_args: ''

- job:
name: cluster-api-provider-openstack-current-acceptance-test-v1.19-1
name: cluster-api-provider-openstack-current-acceptance-test-v1.20-1
parent: cluster-api-provider-openstack-conformance-pr
description: |
Test CAPO current against Kubernetes release-1.19-1
Test CAPO current against Kubernetes release-1.20-1
We run 3 jobs, so that at least one of them hits a cluster
with a good CPU. It's fine if just one of them is successful.
vars:
k8s_version_series: '1.19'
k8s_version_series: '1.20'
extra_args: '--use-ci-artifacts'

- job:
name: cluster-api-provider-openstack-current-acceptance-test-v1.19-2
name: cluster-api-provider-openstack-current-acceptance-test-v1.20-2
parent: cluster-api-provider-openstack-conformance-pr
description: |
Test CAPO current against Kubernetes release-1.19-2
Test CAPO current against Kubernetes release-1.20-2
We run 3 jobs, so that at least one of them hits a cluster
with a good CPU. It's fine if just one of them is successful.
vars:
k8s_version_series: '1.19'
k8s_version_series: '1.20'
extra_args: '--use-ci-artifacts'
- job:
name: cluster-api-provider-openstack-current-acceptance-test-v1.19-3
name: cluster-api-provider-openstack-current-acceptance-test-v1.20-3
parent: cluster-api-provider-openstack-conformance-pr
description: |
Test CAPO current against Kubernetes release-1.19-3
Test CAPO current against Kubernetes release-1.20-3
We run 3 jobs, so that at least one of them hits a cluster
with a good CPU. It's fine if just one of them is successful.
vars:
k8s_version_series: '1.19'
k8s_version_series: '1.20'
extra_args: '--use-ci-artifacts'
2 changes: 1 addition & 1 deletion docs/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Note: You can use [the template file](../templates/cluster-template.yaml) by man
# Using 'external-cloud-provider' flavor
clusterctl config cluster capi-quickstart \
--flavor external-cloud-provider \
--kubernetes-version v1.19.7 \
--kubernetes-version v1.20.4 \
--control-plane-machine-count=3 \
--worker-machine-count=1 \
> capi-quickstart.yaml
Expand Down
2 changes: 1 addition & 1 deletion hack/ci/e2e-conformance.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ OPENSTACK_BASTION_MACHINE_FLAVOR=${OPENSTACK_BASTION_MACHINE_FLAVOR:-"m1.tiny"}
OPENSTACK_CLUSTER_TEMPLATE=${OPENSTACK_CLUSTER_TEMPLATE:-"./templates/cluster-template-without-lb.yaml"}
CLUSTER_NAME=${CLUSTER_NAME:-"capi-quickstart"}
OPENSTACK_SSH_KEY_NAME=${OPENSTACK_SSH_KEY_NAME:-"${CLUSTER_NAME}-key"}
KUBERNETES_VERSION=${KUBERNETES_VERSION:-"v1.19.7"}
KUBERNETES_VERSION=${KUBERNETES_VERSION:-"v1.20.4"}
USE_CI_ARTIFACTS=${USE_CI_ARTIFACTS:-"true"}
IMAGE_REPOSITORY=${IMAGE_REPOSITORY:-"k8s.gcr.io"}

Expand Down