Add release-1.6 branch config for CAPM3 and IPAM

Signed-off-by: smoshiur1237 <moshiur.rahman@est.tech>
Nordix · Jan 9, 2024 · a94cb9e · a94cb9e
1 parent fc79632
commit a94cb9e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -6,6 +6,8 @@ This repository includes scripts to set up a Metal³ development environment.
 
 [![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/)
 [![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/)
+[![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/)
+[![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/)
 [![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/)
 [![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/)
 [![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/)
@@ -184,6 +186,7 @@ The following table describes which branches are tested for different test trigg
 | test suffix | CAPM3 branch | IPAM branch  | BMO branch/tag  | Keepalived tag | Ironic tag |
 | ----------- | ------------ | -----------  | --------------- | -------------- | ---------- |
 | main        | main         | main         | main            | latest         | latest     |
+| release-1-6 | release-1.6  | release-1.6  | release-0.5     | v0.5.0         | v23.1.0    |
 | release-1-5 | release-1.5  | release-1.5  | release-0.4     | v0.4.1         | v23.1.0    |
 | release-1-4 | release-1.4  | release-1.4  | release-0.3     | v0.3.1         | v23.1.0    |
 | release-1-3 | release-1.3  | release-1.3  | v0.2.0          | v0.2.0         | v23.1.0    |
diff --git a/lib/common.sh b/lib/common.sh
@@ -158,6 +158,9 @@ elif [[ "${CAPM3RELEASEBRANCH}" == "release-1.4" ]]; then
 elif [[ "${CAPM3RELEASEBRANCH}" == "release-1.5" ]]; then
   export CAPM3BRANCH="${CAPM3BRANCH:-release-1.5}"
   export IPAMBRANCH="${IPAMBRANCH:-release-1.5}"
+elif [[ "${CAPM3RELEASEBRANCH}" == "release-1.6" ]]; then
+  export CAPM3BRANCH="${CAPM3BRANCH:-release-1.6}"
+  export IPAMBRANCH="${IPAMBRANCH:-release-1.6}"
 else
   export CAPM3BRANCH="${CAPM3BRANCH:-main}"
   export IPAMBRANCH="${IPAMBRANCH:-main}"
@@ -277,6 +280,13 @@ elif [[ "${CAPM3RELEASEBRANCH}" = "release-1.5" ]]; then
   export KEEPALIVED_TAG="v0.4.1"
   export IRONIC_TAG="v23.1.0"
   export BMOBRANCH="${BMORELEASEBRANCH:-release-0.4}"
+elif [[ "${CAPM3RELEASEBRANCH}" = "release-1.6" ]]; then
+  export CAPM3_IMAGE=${CAPM3_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/cluster-api-provider-metal3:release-1.6"}
+  export IPAM_IMAGE=${IPAM_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/ip-address-manager:release-1.6"}
+  export BARE_METAL_OPERATOR_TAG="v0.5.0"
+  export KEEPALIVED_TAG="v0.5.0"
+  export IRONIC_TAG="v23.1.0"
+  export BMOBRANCH="${BMORELEASEBRANCH:-release-0.5}"
 else
   export CAPM3_IMAGE="${CAPM3_IMAGE:-${CONTAINER_REGISTRY}/metal3-io/cluster-api-provider-metal3:main}"
   export IPAM_IMAGE="${IPAM_IMAGE:-${CONTAINER_REGISTRY}/metal3-io/ip-address-manager:main}"

diff --git a/lib/releases.sh b/lib/releases.sh
@@ -80,9 +80,12 @@ elif [ "${CAPM3RELEASEBRANCH}" = "release-1.5" ]; then
   # 1.5.99 points to the head of the release-1.5 branch. Local override for CAPM3 is created for this version.
   export CAPM3RELEASE="v1.5.99"
   export CAPIRELEASE="${CAPIRELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "v1.5.")}"
+elif [ "${CAPM3RELEASEBRANCH}" = "release-1.6" ]; then
+  # 1.6.99 points to the head of the release-1.6 branch. Local override for CAPM3 is created for this version.
+  export CAPM3RELEASE="v1.6.99"
+  export CAPIRELEASE="${CAPIRELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "v1.6.")}"
 else
-  # 1.5.99 points to the head of the main branch as well. Local override for CAPM3 is created for this version.
-  # We should change it to v1.6.99 when we point main branch towards CAI v1.6 contract soon. 
+  # 1.6.99 points to the head of the main branch as well. Local override for CAPM3 is created for this version.
   export CAPM3RELEASE="v1.6.99"
   export CAPIRELEASE="${CAPIRELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "v1.6.")}"
 fi