Skip to content

Commit 0f7cb7b

Browse files
metal3-io-botmetal3-io-bot
authored
Merge pull request #1381 from Nordix/mquhuy/add-release-1.7
Add release-1.7 branch config for CAPM3 and IPAM
2 parents 2ca03a5 + 2e92e4a commit 0f7cb7b

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ This repository includes scripts to set up a Metal³ development environment.
66

77
[![Ubuntu Integration daily main build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3_daily_main_integration_test_ubuntu&subject=Ubuntu%20daily%20main)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3_daily_main_integration_test_ubuntu/)
88
[![CentOS Integration daily main build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3_daily_main_integration_test_centos&subject=CentOS%20daily%20main)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3_daily_main_integration_test_centos/)
9+
[![Ubuntu Integration daily release-1.7 build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3_daily_release-1-6_integration_test_ubuntu&subject=Ubuntu%20daily%20release-1.7)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3_daily_release-1-7_integration_test_ubuntu/)
10+
[![CentOS Integration daily release-1.7 build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3_daily_release-1-6_integration_test_centos&subject=CentOS%20daily%20release-1.7)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3_daily_release-1-7_integration_test_centos/)
911
[![Ubuntu Integration daily release-1.6 build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3_daily_release-1-6_integration_test_ubuntu&subject=Ubuntu%20daily%20release-1.6)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3_daily_release-1-6_integration_test_ubuntu/)
1012
[![CentOS Integration daily release-1.6 build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3_daily_release-1-6_integration_test_centos&subject=CentOS%20daily%20release-1.6)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3_daily_release-1-6_integration_test_centos/)
1113
[![Ubuntu Integration daily release-1.5 build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3_daily_release-1-5_integration_test_ubuntu&subject=Ubuntu%20daily%20release-1.5)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3_daily_release-1-5_integration_test_ubuntu/)
1214
[![CentOS Integration daily release-1.5 build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3_daily_release-1-5_integration_test_centos&subject=CentOS%20daily%20release-1.5)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3_daily_release-1-5_integration_test_centos/)
13-
[![Ubuntu Integration daily release-1.4 build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3_daily_release-1-4_integration_test_ubuntu&subject=Ubuntu%20daily%20release-1.4)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3_daily_release-1-4_integration_test_ubuntu/)
14-
[![CentOS Integration daily release-1.4 build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3_daily_release-1-4_integration_test_centos&subject=CentOS%20daily%20release-1.4)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3_daily_release-1-4_integration_test_centos/)
1515

1616
## Instructions
1717

@@ -186,8 +186,8 @@ The following table describes which branches are tested for different test trigg
186186
| test suffix | CAPM3 branch | IPAM branch | BMO branch/tag | Keepalived tag | Ironic tag |
187187
| ----------- | ------------ | ----------- | --------------- | -------------- | ---------- |
188188
| main | main | main | main | latest | latest |
189+
| release-1-7 | release-1.7 | release-1.7 | release-0.6 | v0.6.0 | v24.1.1 |
189190
| release-1-6 | release-1.6 | release-1.6 | release-0.5 | v0.5.1 | v24.0.0 |
190191
| release-1-5 | release-1.5 | release-1.5 | release-0.4 | v0.4.2 | v23.1.0 |
191-
| release-1-4 | release-1.4 | release-1.4 | release-0.3 | v0.3.1 | v23.1.0 |
192192

193193
<!-- markdownlint-enable MD013 -->

‎lib/common.sh

+12-12
Original file line numberDiff line numberDiff line change
@@ -149,15 +149,15 @@ export CAPM3_BASE_URL="${CAPM3_BASE_URL:-metal3-io/cluster-api-provider-metal3}"
149149
export CAPM3REPO="${CAPM3REPO:-https://github.com/${CAPM3_BASE_URL}}"
150150
export CAPM3RELEASEBRANCH="${CAPM3RELEASEBRANCH:-main}"
151151

152-
if [[ "${CAPM3RELEASEBRANCH}" == "release-1.4" ]]; then
153-
export CAPM3BRANCH="${CAPM3BRANCH:-release-1.4}"
154-
export IPAMBRANCH="${IPAMBRANCH:-release-1.4}"
155-
elif [[ "${CAPM3RELEASEBRANCH}" == "release-1.5" ]]; then
152+
if [[ "${CAPM3RELEASEBRANCH}" == "release-1.5" ]]; then
156153
export CAPM3BRANCH="${CAPM3BRANCH:-release-1.5}"
157154
export IPAMBRANCH="${IPAMBRANCH:-release-1.5}"
158155
elif [[ "${CAPM3RELEASEBRANCH}" == "release-1.6" ]]; then
159156
export CAPM3BRANCH="${CAPM3BRANCH:-release-1.6}"
160157
export IPAMBRANCH="${IPAMBRANCH:-release-1.6}"
158+
elif [[ "${CAPM3RELEASEBRANCH}" == "release-1.7" ]]; then
159+
export CAPM3BRANCH="${CAPM3BRANCH:-release-1.7}"
160+
export IPAMBRANCH="${IPAMBRANCH:-release-1.7}"
161161
else
162162
export CAPM3BRANCH="${CAPM3BRANCH:-main}"
163163
export IPAMBRANCH="${IPAMBRANCH:-main}"
@@ -256,14 +256,7 @@ export VBMC_IMAGE="${VBMC_IMAGE:-${CONTAINER_REGISTRY}/metal3-io/vbmc}"
256256
export SUSHY_TOOLS_IMAGE="${SUSHY_TOOLS_IMAGE:-${CONTAINER_REGISTRY}/metal3-io/sushy-tools}"
257257

258258
# CAPM3 and IPAM controller images
259-
if [[ "${CAPM3RELEASEBRANCH}" = "release-1.4" ]]; then
260-
export CAPM3_IMAGE=${CAPM3_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/cluster-api-provider-metal3:release-1.4"}
261-
export IPAM_IMAGE=${IPAM_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/ip-address-manager:release-1.4"}
262-
export BARE_METAL_OPERATOR_TAG="v0.3.1"
263-
export KEEPALIVED_TAG="v0.3.1"
264-
export IRONIC_TAG="v23.1.0"
265-
export BMOBRANCH="${BMORELEASEBRANCH:-release-0.3}"
266-
elif [[ "${CAPM3RELEASEBRANCH}" = "release-1.5" ]]; then
259+
if [[ "${CAPM3RELEASEBRANCH}" = "release-1.5" ]]; then
267260
export CAPM3_IMAGE=${CAPM3_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/cluster-api-provider-metal3:release-1.5"}
268261
export IPAM_IMAGE=${IPAM_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/ip-address-manager:release-1.5"}
269262
export BARE_METAL_OPERATOR_TAG="v0.4.2"
@@ -277,6 +270,13 @@ elif [[ "${CAPM3RELEASEBRANCH}" = "release-1.6" ]]; then
277270
export KEEPALIVED_TAG="v0.5.1"
278271
export IRONIC_TAG="v24.0.0"
279272
export BMOBRANCH="${BMORELEASEBRANCH:-release-0.5}"
273+
elif [[ "${CAPM3RELEASEBRANCH}" = "release-1.7" ]]; then
274+
export CAPM3_IMAGE=${CAPM3_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/cluster-api-provider-metal3:release-1.7"}
275+
export IPAM_IMAGE=${IPAM_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/ip-address-manager:release-1.7"}
276+
export BARE_METAL_OPERATOR_TAG="v0.6.0"
277+
export KEEPALIVED_TAG="v0.6.0"
278+
export IRONIC_TAG="v24.1.1"
279+
export BMOBRANCH="${BMORELEASEBRANCH:-release-0.6}"
280280
else
281281
export CAPM3_IMAGE="${CAPM3_IMAGE:-${CONTAINER_REGISTRY}/metal3-io/cluster-api-provider-metal3:main}"
282282
export IPAM_IMAGE="${IPAM_IMAGE:-${CONTAINER_REGISTRY}/metal3-io/ip-address-manager:main}"

‎lib/releases.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -66,21 +66,21 @@ function get_latest_release() {
6666
}
6767

6868
# CAPM3, CAPI and BMO release path
69-
CAPM3RELEASEPATH="{https://api.github.com/repos/${CAPM3_BASE_URL:-metal3-io/cluster-api-provider-metal3}/releases}"
7069
CAPIRELEASEPATH="{https://api.github.com/repos/${CAPI_BASE_URL:-kubernetes-sigs/cluster-api}/releases}"
7170

7271
# CAPM3, CAPI and BMO releases
73-
if [ "${CAPM3RELEASEBRANCH}" = "release-1.4" ]; then
74-
export CAPM3RELEASE="${CAPM3RELEASE:-$(get_latest_release "${CAPM3RELEASEPATH}" "v1.4.")}"
75-
export CAPIRELEASE="${CAPIRELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "v1.4.")}"
76-
elif [ "${CAPM3RELEASEBRANCH}" = "release-1.5" ]; then
72+
if [ "${CAPM3RELEASEBRANCH}" = "release-1.5" ]; then
7773
# 1.5.99 points to the head of the release-1.5 branch. Local override for CAPM3 is created for this version.
7874
export CAPM3RELEASE="v1.5.99"
7975
export CAPIRELEASE="${CAPIRELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "v1.5.")}"
8076
elif [ "${CAPM3RELEASEBRANCH}" = "release-1.6" ]; then
8177
# 1.6.99 points to the head of the release-1.6 branch. Local override for CAPM3 is created for this version.
8278
export CAPM3RELEASE="v1.6.99"
8379
export CAPIRELEASE="${CAPIRELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "v1.6.")}"
80+
elif [ "${CAPM3RELEASEBRANCH}" = "release-1.7" ]; then
81+
# 1.7.99 points to the head of the release-1.7 branch. Local override for CAPM3 is created for this version.
82+
export CAPM3RELEASE="v1.7.99"
83+
export CAPIRELEASE="${CAPIRELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "v1.7.")}"
8484
else
8585
# 1.7.99 points to the head of the main branch as well. Local override for CAPM3 is created for this version.
8686
export CAPM3RELEASE="v1.7.99"

0 commit comments

Comments
 (0)