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.

Sign up for GitHub

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.7 branch config for CAPM3 and IPAM #1381

Merged
merged 1 commit into from
Apr 25, 2024
Merged

Add release-1.7 branch config for CAPM3 and IPAM #1381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ 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.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/)
[![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/)
[![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/)
[![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/)

## Instructions

Expand Down Expand Up @@ -186,8 +186,8 @@ 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-7 | release-1.7 | release-1.7 | release-0.6 | v0.6.0 | 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 |
| release-1-4 | release-1.4 | release-1.4 | release-0.3 | v0.3.1 | v23.1.0 |

<!-- markdownlint-enable MD013 -->
24 changes: 12 additions & 12 deletions lib/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,15 +149,15 @@ export CAPM3_BASE_URL="${CAPM3_BASE_URL:-metal3-io/cluster-api-provider-metal3}"
export CAPM3REPO="${CAPM3REPO:-https://github.com/${CAPM3_BASE_URL}}"
export CAPM3RELEASEBRANCH="${CAPM3RELEASEBRANCH:-main}"

if [[ "${CAPM3RELEASEBRANCH}" == "release-1.4" ]]; then
export CAPM3BRANCH="${CAPM3BRANCH:-release-1.4}"
export IPAMBRANCH="${IPAMBRANCH:-release-1.4}"
elif [[ "${CAPM3RELEASEBRANCH}" == "release-1.5" ]]; then
if [[ "${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}"
elif [[ "${CAPM3RELEASEBRANCH}" == "release-1.7" ]]; then
export CAPM3BRANCH="${CAPM3BRANCH:-release-1.7}"
export IPAMBRANCH="${IPAMBRANCH:-release-1.7}"
mquhuy marked this conversation as resolved.
Show resolved Hide resolved
else
export CAPM3BRANCH="${CAPM3BRANCH:-main}"
export IPAMBRANCH="${IPAMBRANCH:-main}"
Expand Down Expand Up @@ -256,14 +256,7 @@ export VBMC_IMAGE="${VBMC_IMAGE:-${CONTAINER_REGISTRY}/metal3-io/vbmc}"
export SUSHY_TOOLS_IMAGE="${SUSHY_TOOLS_IMAGE:-${CONTAINER_REGISTRY}/metal3-io/sushy-tools}"

# CAPM3 and IPAM controller images
if [[ "${CAPM3RELEASEBRANCH}" = "release-1.4" ]]; then
export CAPM3_IMAGE=${CAPM3_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/cluster-api-provider-metal3:release-1.4"}
export IPAM_IMAGE=${IPAM_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/ip-address-manager:release-1.4"}
export BARE_METAL_OPERATOR_TAG="v0.3.1"
export KEEPALIVED_TAG="v0.3.1"
export IRONIC_TAG="v23.1.0"
export BMOBRANCH="${BMORELEASEBRANCH:-release-0.3}"
elif [[ "${CAPM3RELEASEBRANCH}" = "release-1.5" ]]; then
if [[ "${CAPM3RELEASEBRANCH}" = "release-1.5" ]]; then
export CAPM3_IMAGE=${CAPM3_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/cluster-api-provider-metal3:release-1.5"}
export IPAM_IMAGE=${IPAM_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/ip-address-manager:release-1.5"}
export BARE_METAL_OPERATOR_TAG="v0.4.2"
Expand All @@ -277,6 +270,13 @@ elif [[ "${CAPM3RELEASEBRANCH}" = "release-1.6" ]]; then
export KEEPALIVED_TAG="v0.5.1"
export IRONIC_TAG="v24.0.0"
export BMOBRANCH="${BMORELEASEBRANCH:-release-0.5}"
elif [[ "${CAPM3RELEASEBRANCH}" = "release-1.7" ]]; then
mquhuy marked this conversation as resolved.
Show resolved Hide resolved
export CAPM3_IMAGE=${CAPM3_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/cluster-api-provider-metal3:release-1.7"}
export IPAM_IMAGE=${IPAM_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/ip-address-manager:release-1.7"}
export BARE_METAL_OPERATOR_TAG="v0.6.0"
export KEEPALIVED_TAG="v0.6.0"
export IRONIC_TAG="v24.1.1"
export BMOBRANCH="${BMORELEASEBRANCH:-release-0.6}"
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
10 changes: 5 additions & 5 deletions lib/releases.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,21 +66,21 @@ function get_latest_release() {
}

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

# CAPM3, CAPI and BMO releases
if [ "${CAPM3RELEASEBRANCH}" = "release-1.4" ]; then
export CAPM3RELEASE="${CAPM3RELEASE:-$(get_latest_release "${CAPM3RELEASEPATH}" "v1.4.")}"
export CAPIRELEASE="${CAPIRELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "v1.4.")}"
elif [ "${CAPM3RELEASEBRANCH}" = "release-1.5" ]; then
if [ "${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.")}"
elif [ "${CAPM3RELEASEBRANCH}" = "release-1.7" ]; then
mquhuy marked this conversation as resolved.
Show resolved Hide resolved
# 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.")}"
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