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.

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

🌱 Add release-1.8-branch-config #1443

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-8 | release-1.8 | release-1.8 | release-0.8 | v0.8.0-rc.0 | v25.0.0 |
| release-1-7 | release-1.7 | release-1.7 | release-0.6 | v0.6.1 | v24.1.1 |
| release-1-6 | release-1.6 | release-1.6 | release-0.5 | v0.5.1 | v24.0.0 |
| release-1-5 | release-1.5 | release-1.5 | release-0.4 | v0.4.2 | v23.1.0 |
Expand Down
11 changes: 11 additions & 0 deletions lib/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@ elif [[ "${CAPM3RELEASEBRANCH}" == "release-1.6" ]]; then
elif [[ "${CAPM3RELEASEBRANCH}" == "release-1.7" ]]; then
export CAPM3BRANCH="${CAPM3BRANCH:-release-1.7}"
export IPAMBRANCH="${IPAMBRANCH:-release-1.7}"
elif [[ "${CAPM3RELEASEBRANCH}" == "release-1.8" ]]; then
export CAPM3BRANCH="${CAPM3BRANCH:-release-1.8}"
export IPAMBRANCH="${IPAMBRANCH:-release-1.8}"
else
export CAPM3BRANCH="${CAPM3BRANCH:-main}"
export IPAMBRANCH="${IPAMBRANCH:-main}"
Expand Down Expand Up @@ -289,6 +292,14 @@ elif [[ "${CAPM3RELEASEBRANCH}" = "release-1.7" ]]; then
export IRONIC_TAG="v24.1.1"
export BMOCOMMIT="eea41f4fbcf73c5aae7e015ad552b137ae507dbb" # tag v0.6.1
export BMOBRANCH="${BMORELEASEBRANCH:-release-0.6}"
elif [[ "${CAPM3RELEASEBRANCH}" = "release-1.8" ]]; then
export CAPM3_IMAGE=${CAPM3_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/cluster-api-provider-metal3:release-1.8"}
export IPAM_IMAGE=${IPAM_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/ip-address-manager:release-1.8"}
export BARE_METAL_OPERATOR_TAG="v0.8.0-rc.0"
export KEEPALIVED_TAG="v0.8.0-rc.0"
export IRONIC_TAG="v25.0.0"
export BMOCOMMIT="39afcb50cb22926577dd3fa20e3b15c700beed4f" # tag v0.8.0-rc.0
export BMOBRANCH="${BMORELEASEBRANCH:-release-0.8}"
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}"
Expand Down
4 changes: 4 additions & 0 deletions lib/releases.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ elif [ "${CAPM3RELEASEBRANCH}" = "release-1.7" ]; then
# 1.7.99 points to the head of the release-1.7 branch. Local override for CAPM3 is created for this version.
export CAPM3RELEASE="v1.7.99"
export CAPIRELEASE="${CAPIRELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "v1.7.")}"
elif [ "${CAPM3RELEASEBRANCH}" = "release-1.8" ]; then
# 1.8.99 points to the head of the release-1.8 branch. Local override for CAPM3 is created for this version.
export CAPM3RELEASE="v1.8.99"
export CAPIRELEASE="${CAPIRELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "v1.8.")}"
else
# 1.7.99 points to the head of the main branch as well. Local override for CAPM3 is created for this version.
export CAPM3RELEASE="v1.7.99"
Expand Down