Merge pull request #1485 from Nordix/tuomo/prep-for-1.9

add support for release-1.9

README.md

@@ -180,6 +180,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-9 | release-1.9  | release-1.9  | release-0.9     | v0.9.0         | v27.0.0    |
 | release-1-8 | release-1.8  | release-1.8  | release-0.8     | v0.8.0         | v26.0.1    |
 | release-1-7 | release-1.7  | release-1.7  | release-0.6     | v0.6.1         | v25.0.1    |
 | release-1-6 | release-1.6  | release-1.6  | release-0.5     | v0.5.1         | v24.1.1    |

lib/common.sh

@@ -170,6 +170,9 @@ elif [[ "${CAPM3RELEASEBRANCH}" == "release-1.7" ]]; then
 elif [[ "${CAPM3RELEASEBRANCH}" == "release-1.8" ]]; then
   export CAPM3BRANCH="${CAPM3BRANCH:-release-1.8}"
   export IPAMBRANCH="${IPAMBRANCH:-release-1.8}"
+elif [[ "${CAPM3RELEASEBRANCH}" == "release-1.9" ]]; then
+  export CAPM3BRANCH="${CAPM3BRANCH:-release-1.9}"
+  export IPAMBRANCH="${IPAMBRANCH:-release-1.9}"
 else
   export CAPM3BRANCH="${CAPM3BRANCH:-main}"
   export IPAMBRANCH="${IPAMBRANCH:-main}"
@@ -305,6 +308,13 @@ elif [[ "${CAPM3RELEASEBRANCH}" = "release-1.8" ]]; then
   export IRONIC_TAG="v26.0.1"
   export BMOCOMMIT="c2b5a557641bc273367635124047d6c958aa15f7" # tag v0.8.0
   export BMOBRANCH="${BMORELEASEBRANCH:-release-0.8}"
+elif [[ "${CAPM3RELEASEBRANCH}" = "release-1.9" ]]; then
+  export CAPM3_IMAGE=${CAPM3_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/cluster-api-provider-metal3:release-1.9"}
+  export IPAM_IMAGE=${IPAM_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/ip-address-manager:release-1.9"}
+  export BARE_METAL_OPERATOR_TAG="v0.9.0"
+  export KEEPALIVED_TAG="v0.9.0"
+  export IRONIC_TAG="v27.0.0"
+  export BMOBRANCH="${BMORELEASEBRANCH:-release-0.9}"
 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}"

lib/releases.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Requires parameters url and version. An optional parameter can be given to
-# exclude some versions. 
+# exclude some versions.
 # Example usage:
 # get_latest_release_from_goproxy "https://proxy.golang.org/sigs.k8s.io/cluster-api/@v/list" "v1.8." "beta|rc|pre|alpha"
 get_latest_release_from_goproxy() {
@@ -30,16 +30,16 @@ CAPIGOPROXY="https://proxy.golang.org/sigs.k8s.io/cluster-api/@v/list"
 # Extract release version from release-branch name
 if [[ "${CAPM3RELEASEBRANCH}" == release-* ]]; then
   CAPM3_RELEASE_PREFIX="${CAPM3RELEASEBRANCH#release-}"
-else 
+else
   CAPM3_RELEASE_PREFIX=""
-fi 
+fi
 
 # Fetch CAPI version that coresponds to CAPM3_RELEASE_PREFIX release version
-if [[ "${CAPM3_RELEASE_PREFIX}" =~ ^(1\.6|1\.7|1\.8)$ ]]; then
+if [[ "${CAPM3_RELEASE_PREFIX}" =~ ^(1\.6|1\.7|1\.8|1\.9)$ ]]; then
   export CAPM3RELEASE="v${CAPM3_RELEASE_PREFIX}.99"
   CAPI_RELEASE_PREFIX="v${CAPM3_RELEASE_PREFIX}."
 else
-  export CAPM3RELEASE="v1.9.99"
+  export CAPM3RELEASE="v1.10.99"
   CAPI_RELEASE_PREFIX="v1.9."
 fi
 export CAPIRELEASE="${CAPIRELEASE:-$(get_latest_release_from_goproxy "${CAPIGOPROXY}" "${CAPI_RELEASE_PREFIX}")}"