Skip to content

Commit f929d08

Browse files
SunnatilloSunnatillo
committed
Prepare main branch for relase-1.13 dev
This commit: - Adds clusterctl-settings, e2e config - Updates the available test triggers of different branches, removes deprecated triggers - Updates the support matrix in the README - Introduce ironic-image v33.0 support - Add release-1.12 e2e template generation to Makefile Signed-off-by: Sunnatillo <[email protected]>
1 parent ee70ff7 commit f929d08

File tree

53 files changed

+2487
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+2487
-79
lines changed

‎Makefile‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ SKIP_CREATE_MGMT_CLUSTER ?= true
173173
.PHONY: e2e-substitutions
174174
e2e-substitutions: $(ENVSUBST)
175175
mkdir -p $(E2E_OUT_DIR)/main
176+
mkdir -p $(E2E_OUT_DIR)/v1.12
176177
mkdir -p $(E2E_OUT_DIR)/v1.11
177178
mkdir -p $(E2E_OUT_DIR)/v1.10
178179
mkdir -p $(E2E_OUT_DIR)/v1.9
@@ -183,11 +184,11 @@ e2e-substitutions: $(ENVSUBST)
183184
## --------------------------------------
184185
##@ templates
185186
E2E_TEMPLATES_DIR ?= $(ROOT_DIR)/test/e2e/data/infrastructure-metal3
186-
.PHONY: cluster-templates cluster-templates-main cluster-templates-v1.11 cluster-templates-v1.10 cluster-templates-v1.9
187-
cluster-templates: cluster-templates-main cluster-templates-v1.11 cluster-templates-v1.10 cluster-templates-v1.9
187+
.PHONY: cluster-templates cluster-templates-main cluster-templates-v1.12 cluster-templates-v1.11 cluster-templates-v1.10
188+
cluster-templates: cluster-templates-main cluster-templates-v1.12 cluster-templates-v1.11 cluster-templates-v1.10
188189

189-
PHONY: clusterclass-templates clusterclass-templates-main clusterclass-templates-v1.11 clusterclass-templates-v1.10 clusterclass-templates-v1.9
190-
clusterclass-templates: clusterclass-templates-main clusterclass-templates-v1.11 clusterclass-templates-v1.10 clusterclass-templates-v1.9
190+
PHONY: clusterclass-templates clusterclass-templates-main clusterclass-templates-v1.12 clusterclass-templates-v1.11 clusterclass-templates-v1.10
191+
clusterclass-templates: clusterclass-templates-main clusterclass-templates-v1.12 clusterclass-templates-v1.11 clusterclass-templates-v1.10
191192

192193
.PHONY: cluster-templates-main
193194
cluster-templates-main: $(KUSTOMIZE) ## Generate cluster templates
@@ -212,6 +213,18 @@ clusterclass-templates-main: $(KUSTOMIZE) ## Generate cluster templates
212213
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/main/clusterclass-template-upgrade-workload > $(E2E_OUT_DIR)/main/cluster-template-upgrade-workload.yaml
213214
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/main/clusterclass > $(E2E_OUT_DIR)/main/clusterclass.yaml
214215

216+
.PHONY: cluster-templates-v1.12
217+
cluster-templates-v1.12: $(KUSTOMIZE) ## Generate cluster templates
218+
mkdir -p $(E2E_OUT_DIR)/v1.12
219+
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.12/cluster-template-ubuntu > $(E2E_OUT_DIR)/v1.12/cluster-template-ubuntu.yaml
220+
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.12/cluster-template-centos > $(E2E_OUT_DIR)/v1.12/cluster-template-centos.yaml
221+
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.12/cluster-template-centos-fake > $(E2E_OUT_DIR)/v1.12/cluster-template-centos-fake.yaml
222+
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.12/clusterclass-metal3 > $(E2E_OUT_DIR)/v1.12/clusterclass-metal3.yaml
223+
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.12/cluster-template-upgrade-workload > $(E2E_OUT_DIR)/v1.12/cluster-template-upgrade-workload.yaml
224+
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.12/cluster-template-centos-md-remediation > $(E2E_OUT_DIR)/v1.12/cluster-template-centos-md-remediation.yaml
225+
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.12/cluster-template-ubuntu-md-remediation > $(E2E_OUT_DIR)/v1.12/cluster-template-ubuntu-md-remediation.yaml
226+
touch $(E2E_OUT_DIR)/v1.12/clusterclass.yaml
227+
215228

216229
.PHONY: cluster-templates-v1.11
217230
cluster-templates-v1.11: $(KUSTOMIZE) ## Generate cluster templates
@@ -223,7 +236,15 @@ cluster-templates-v1.11: $(KUSTOMIZE) ## Generate cluster templates
223236
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.11/cluster-template-upgrade-workload > $(E2E_OUT_DIR)/v1.11/cluster-template-upgrade-workload.yaml
224237
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.11/cluster-template-centos-md-remediation > $(E2E_OUT_DIR)/v1.11/cluster-template-centos-md-remediation.yaml
225238
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.11/cluster-template-ubuntu-md-remediation > $(E2E_OUT_DIR)/v1.11/cluster-template-ubuntu-md-remediation.yaml
226-
touch $(E2E_OUT_DIR)/v1.10/clusterclass.yaml
239+
touch $(E2E_OUT_DIR)/v1.11/clusterclass.yaml
240+
241+
.PHONY: clusterclass-templates-v1.12
242+
clusterclass-templates-v1.12: $(KUSTOMIZE) ## Generate cluster templates
243+
mkdir -p $(E2E_OUT_DIR)/v1.12
244+
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.12/clusterclass-template-ubuntu > $(E2E_OUT_DIR)/v1.12/cluster-template-ubuntu.yaml
245+
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.12/clusterclass-template-centos > $(E2E_OUT_DIR)/v1.12/cluster-template-centos.yaml
246+
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.12/clusterclass-template-upgrade-workload > $(E2E_OUT_DIR)/v1.12/cluster-template-upgrade-workload.yaml
247+
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.12/clusterclass > $(E2E_OUT_DIR)/v1.12/clusterclass.yaml
227248

228249
.PHONY: clusterclass-templates-v1.11
229250
clusterclass-templates-v1.11: $(KUSTOMIZE) ## Generate cluster templates
@@ -253,26 +274,6 @@ clusterclass-templates-v1.10: $(KUSTOMIZE) ## Generate cluster templates
253274
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.10/clusterclass-template-upgrade-workload > $(E2E_OUT_DIR)/v1.10/cluster-template-upgrade-workload.yaml
254275
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.10/clusterclass > $(E2E_OUT_DIR)/v1.10/clusterclass.yaml
255276

256-
.PHONY: cluster-templates-v1.9
257-
cluster-templates-v1.9: $(KUSTOMIZE) ## Generate cluster templates
258-
mkdir -p $(E2E_OUT_DIR)/v1.9
259-
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.9/cluster-template-ubuntu > $(E2E_OUT_DIR)/v1.9/cluster-template-ubuntu.yaml
260-
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.9/cluster-template-centos > $(E2E_OUT_DIR)/v1.9/cluster-template-centos.yaml
261-
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.9/cluster-template-centos-fake > $(E2E_OUT_DIR)/v1.9/cluster-template-centos-fake.yaml
262-
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.9/clusterclass-metal3 > $(E2E_OUT_DIR)/v1.9/clusterclass-metal3.yaml
263-
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.9/cluster-template-upgrade-workload > $(E2E_OUT_DIR)/v1.9/cluster-template-upgrade-workload.yaml
264-
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.9/cluster-template-centos-md-remediation > $(E2E_OUT_DIR)/v1.9/cluster-template-centos-md-remediation.yaml
265-
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.9/cluster-template-ubuntu-md-remediation > $(E2E_OUT_DIR)/v1.9/cluster-template-ubuntu-md-remediation.yaml
266-
touch $(E2E_OUT_DIR)/v1.9/clusterclass.yaml
267-
268-
.PHONY: clusterclass-templates-v1.9
269-
clusterclass-templates-v1.9: $(KUSTOMIZE) ## Generate cluster templates
270-
mkdir -p $(E2E_OUT_DIR)/v1.9
271-
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.9/clusterclass-template-ubuntu > $(E2E_OUT_DIR)/v1.9/cluster-template-ubuntu.yaml
272-
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.9/clusterclass-template-centos > $(E2E_OUT_DIR)/v1.9/cluster-template-centos.yaml
273-
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.9/clusterclass-template-upgrade-workload > $(E2E_OUT_DIR)/v1.9/cluster-template-upgrade-workload.yaml
274-
$(KUSTOMIZE) build $(E2E_TEMPLATES_DIR)/v1.9/clusterclass > $(E2E_OUT_DIR)/v1.9/clusterclass.yaml
275-
276277
## --------------------------------------
277278
## E2E Testing
278279
## --------------------------------------

‎README.md‎

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ Metal3.
3535
| v1beta1 | v1beta1 | v1.9.X |  v1.9.X        |
3636
| v1beta1 | v1beta1 | v1.10.X |  v1.10.X       |
3737
| v1beta1 | v1beta1 | v1.11.X |  v1.11.X       |
38+
| v1beta1 | v1beta1 | v1.12.X |  v1.12.X       |
3839

3940
## Deploying the metal3 provider
4041

@@ -53,9 +54,9 @@ need to be manually installed. Example flow of installing Metal3 provider:
5354
level of the logging verbose with a positive integer number, ie. -v5.
5455

5556
```shell
56-
clusterctl init --core cluster-api:v1.11.0 \
57-
--bootstrap kubeadm:v1.11.0 \
58-
--control-plane kubeadm:v1.11.0 -v5
57+
clusterctl init --core cluster-api:v1.12.0 \
58+
--bootstrap kubeadm:v1.12.0 \
59+
--control-plane kubeadm:v1.12.0 -v5
5960
```
6061

6162
1. Install Metal3 provider. This will install the latest version of Cluster API
@@ -69,7 +70,7 @@ need to be manually installed. Example flow of installing Metal3 provider:
6970
provider name as follows:
7071

7172
```shell
72-
clusterctl init --infrastructure metal3:v1.11.0
73+
clusterctl init --infrastructure metal3:v1.12.0
7374
```
7475

7576
1. Deploy Baremetal Operator manifests and CRDs. You need to install
@@ -147,6 +148,13 @@ To trigger e2e test on a PR, use the following phrases:
147148
- **/test-centos-e2e-integration-test-main** runs integration e2e
148149
tests with CAPM3 API version v1beta1 and branch main on CentOS
149150

151+
Release-1.12 branch:
152+
153+
- **/test metal3-ubuntu-e2e-integration-test-release-1-12** runs integration e2e
154+
tests with CAPM3 API version v1beta1 and branch release-1.12 on Ubuntu
155+
- **/test metal3-centos-e2e-integration-test-release-1-12** runs integration e2e
156+
tests with CAPM3 API version v1beta1 and branch release-1.12 on CentOS
157+
150158
Release-1.11 branch:
151159

152160
- **/test metal3-ubuntu-e2e-integration-test-release-1-11** runs integration e2e
@@ -161,26 +169,19 @@ Release-1.10 branch:
161169
- **/test metal3-centos-e2e-integration-test-release-1-10** runs integration e2e
162170
tests with CAPM3 API version v1beta1 and branch release-1.10 on CentOS
163171

164-
Release-1.9 branch:
165-
166-
- **/test metal3-ubuntu-e2e-integration-test-release-1-9** runs integration e2e
167-
tests with CAPM3 API version v1beta1 and branch release-1.9 on Ubuntu
168-
- **/test metal3-centos-e2e-integration-test-release-1-9** runs integration e2e
169-
tests with CAPM3 API version v1beta1 and branch release-1.9 on CentOS
170-
171172
## Basic tests
172173

173174
Unlike integration tests, basic tests focus on the target cluster creation
174175
without involving pivoting from the bootstrap cluster. To run basic tests use:
175176

176177
- **/test metal3-ubuntu-e2e-basic-test-main** runs basic e2e tests with main
177178
branch on Ubuntu
179+
- **/test metal3-centos-e2e-basic-test-release-1-12** runs basic e2e tests on
180+
release-1.12 branch with centos
178181
- **/test metal3-centos-e2e-basic-test-release-1-11** runs basic e2e tests on
179182
release-1.11 branch with centos
180183
- **/test metal3-centos-e2e-basic-test-release-1-10** runs basic e2e tests on
181184
release-1.10 branch with centos
182-
- **/test metal3-centos-e2e-basic-test-release-1-9** runs basic e2e tests on
183-
release-1.9 branch with centos
184185

185186
### Feature tests
186187

@@ -199,6 +200,27 @@ feature tests with CAPM3 API version v1beta1 and branch main on Ubuntu
199200
- **/test metal3-centos-e2e-feature-test-main-features** runs e2e non pivot based
200201
feature tests with CAPM3 API version v1beta1 and branch main on CentOS
201202

203+
Release-1.12 branch:
204+
205+
- **/test metal3-ubuntu-e2e-feature-test-release-1-12-pivoting** runs e2e pivot
206+
based feature tests with CAPM3 API version v1beta1 and branch release-1.12
207+
on Ubuntu
208+
- **/test metal3-ubuntu-e2e-feature-test-release-1-12-remediation** runs e2e
209+
remediation based feature tests with CAPM3 API version v1beta1 and branch
210+
release-1.12 on Ubuntu
211+
- **/test metal3-ubuntu-e2e-feature-test-release-1-12-features** runs e2e non
212+
pivot based feature tests with CAPM3 API version v1beta1 and branch release-1.12
213+
on Ubuntu
214+
- **/test metal3-centos-e2e-feature-test-release-1-12-pivoting** runs e2e pivot
215+
based feature tests with CAPM3 API version v1beta1 and branch release-1.12 on
216+
CentOS
217+
- **/test metal3-centos-e2e-feature-test-release-1-12-remediation** runs e2e
218+
remediation based feature tests with CAPM3 API version v1beta1 and branch
219+
release-1.12 on CentOS
220+
- **/test metal3-centos-e2e-feature-test-release-1-12-features** runs e2e non
221+
pivot based feature tests with CAPM3 API version v1beta1 and branch
222+
release-1.12 on CentOS
223+
202224
Release-1.11 branch:
203225

204226
- **/test metal3-ubuntu-e2e-feature-test-release-1-11-pivoting** runs e2e pivot
@@ -241,27 +263,6 @@ Release-1.10 branch:
241263
pivot based feature tests with CAPM3 API version v1beta1 and branch
242264
release-1.10 on CentOS
243265

244-
Release-1.9 branch:
245-
246-
- **/test metal3-ubuntu-e2e-feature-test-release-1-9-pivoting** runs e2e pivot
247-
based feature tests with CAPM3 API version v1beta1 and branch release-1.9
248-
on Ubuntu
249-
- **/test metal3-ubuntu-e2e-feature-test-release-1-9-remediation** runs e2e
250-
remediation based feature tests with CAPM3 API version v1beta1 and branch
251-
release-1.9 on Ubuntu
252-
- **/test metal3-ubuntu-e2e-feature-test-release-1-9-features** runs e2e non
253-
pivot based feature tests with CAPM3 API version v1beta1 and branch release-1.9
254-
on Ubuntu
255-
- **/test metal3-centos-e2e-feature-test-release-1-9-pivoting** runs e2e pivot
256-
based feature tests with CAPM3 API version v1beta1 and branch release-1.9 on
257-
CentOS
258-
- **/test metal3-centos-e2e-feature-test-release-1-9-remediation** runs e2e
259-
remediation based feature tests with CAPM3 API version v1beta1 and branch
260-
release-1.9 on CentOS
261-
- **/test metal3-centos-e2e-feature-test-release-1-9-features** runs e2e non
262-
pivot based feature tests with CAPM3 API version v1beta1 and branch
263-
release-1.9 on CentOS
264-
265266
### Upgrade tests
266267

267268
#### Clusterctl upgrade tests
@@ -272,24 +273,25 @@ We run upgrade test on main branch from different releases:
272273
- **/test metal3-e2e-clusterctl-upgrade-test-main** runs e2e clusterctl
273274
upgrade tests on main with Ubuntu
274275

276+
- **/test metal3-e2e-clusterctl-upgrade-test-release-1-12** runs e2e clusterctl
277+
upgrade tests on release-1.12 with Ubuntu
278+
275279
- **/test metal3-e2e-clusterctl-upgrade-test-release-1-11** runs e2e clusterctl
276280
upgrade tests on release-1.11 with Ubuntu
277281

278282
- **/test metal3-e2e-clusterctl-upgrade-test-release-1-10** runs e2e clusterctl
279283
upgrade tests on release-1.10 with Ubuntu
280284

281-
- **/test metal3-e2e-clusterctl-upgrade-test-release-1-9** runs e2e clusterctl
282-
upgrade tests on release-1.9 with Ubuntu
283-
284285
#### K8s upgrade tests
285286

286287
CAPM3 tests upgrading kubernetes between last 3 releases.
287288
The trigger takes the format:
288289
`/test metal3-e2e-<from-minor-k8s-v>-<to-minor-k8s-v>-upgrade-test-<branch>`
289290

290291
- **/test metal3-e2e-1-33-1-34-upgrade-test-main**
292+
- **/test metal3-e2e-1-33-1-34-upgrade-test-release-1-12**
293+
- **/test metal3-e2e-1-31-1-32-upgrade-test-release-1-11**
291294
- **/test metal3-e2e-1-32-1-33-upgrade-test-release-1-10**
292-
- **/test metal3-e2e-1-31-1-32-upgrade-test-release-1-9**
293295

294296
Note:
295297

‎clusterctl-settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "infrastructure-metal3",
33
"config": {
44
"componentsFile": "infrastructure-components.yaml",
5-
"nextVersion": "v1.12.99"
5+
"nextVersion": "v1.13.99"
66
}
77
}

‎scripts/ci-e2e.sh‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@ if [[ "${CAPM3RELEASEBRANCH}" == release-* ]]; then
1818
export IPAMRELEASE="v${CAPM3_RELEASE_PREFIX}.99"
1919
export CAPI_RELEASE_PREFIX="v${CAPM3_RELEASE_PREFIX}."
2020
else
21-
export CAPM3RELEASE="v1.12.99"
22-
export IPAMRELEASE="v1.12.99"
21+
export CAPM3RELEASE="v1.13.99"
22+
export IPAMRELEASE="v1.13.99"
2323
# Commenting this out as CAPI release prefix and exporting CAPIRELEASE
2424
# during pre-release phase of CAPI.
2525
# We will change when minor is released.
26-
# export CAPI_RELEASE_PREFIX="v1.12."
27-
export CAPIRELEASE="v1.12.0-rc.1"
26+
export CAPI_RELEASE_PREFIX="v1.13."
2827
fi
2928

3029
# Default CAPI_CONFIG_FOLDER to $HOME/.config folder if XDG_CONFIG_HOME not set
@@ -64,7 +63,7 @@ export DATE
6463
# If CAPI_NIGHTLY_BUILD is true, it means that the tests are run against the
6564
# nightly build of CAPI components which are built from CAPI's main branch.
6665
if [[ "${CAPI_NIGHTLY_BUILD:-false}" == "true" ]]; then
67-
export CAPIRELEASE="v1.12.99"
66+
export CAPIRELEASE="v1.13.99"
6867
echo 'export CAPI_NIGHTLY_BUILD="true"' >>"${M3_DEV_ENV_PATH}/config_${USER}.sh"
6968
fi
7069

0 commit comments

Comments
 (0)