Skip to content

Commit

Permalink
Merge pull request metal3-io#1336 from Nordix/tuomo/remove-release-1.3
Browse files Browse the repository at this point in the history
remove release 1.3 support
  • Loading branch information
metal3-io-bot authored Jan 15, 2024
2 parents 5ff9049 + bd6ce8c commit b2aa443
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 25 deletions.
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ This repository includes scripts to set up a Metal³ development environment.
[![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/)
[![Ubuntu Integration daily release-1.3 build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3_daily_release-1-3_integration_test_ubuntu&subject=Ubuntu%20daily%20release-1.3)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3_daily_release-1-3_integration_test_ubuntu/)
[![CentOS Integration daily release-1.3 build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3_daily_release-1-3_integration_test_centos&subject=CentOS%20daily%20release-1.3)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3_daily_release-1-3_integration_test_centos/)

## Instructions

Expand Down Expand Up @@ -183,10 +181,13 @@ these documents:

The following table describes which branches are tested for different test triggers:

<!-- markdownlint-disable MD013 -->

| 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 |

<!-- markdownlint-enable MD013 -->
14 changes: 2 additions & 12 deletions lib/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,7 @@ 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.3" ]]; then
export CAPM3BRANCH="${CAPM3BRANCH:-release-1.3}"
export IPAMBRANCH="${IPAMBRANCH:-release-1.3}"
elif [[ "${CAPM3RELEASEBRANCH}" == "release-1.4" ]]; then
if [[ "${CAPM3RELEASEBRANCH}" == "release-1.4" ]]; then
export CAPM3BRANCH="${CAPM3BRANCH:-release-1.4}"
export IPAMBRANCH="${IPAMBRANCH:-release-1.4}"
elif [[ "${CAPM3RELEASEBRANCH}" == "release-1.5" ]]; then
Expand Down Expand Up @@ -259,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.3" ]]; then
export CAPM3_IMAGE=${CAPM3_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/cluster-api-provider-metal3:release-1.3"}
export IPAM_IMAGE=${IPAM_IMAGE:-"${CONTAINER_REGISTRY}/metal3-io/ip-address-manager:release-1.3"}
export BARE_METAL_OPERATOR_TAG="v0.2.0"
export KEEPALIVED_TAG="v0.2.0"
export IRONIC_TAG="v23.1.0"
export BMOBRANCH="${BMORELEASEBRANCH:-v0.2.0}"
elif [[ "${CAPM3RELEASEBRANCH}" = "release-1.4" ]]; then
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"
Expand Down
17 changes: 7 additions & 10 deletions lib/releases.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/bin/bash

function get_latest_release() {

# fail when release_path is not passed
local release_path="${1:?no release path is given}"

# set url to get 100 releases from first page
local url="${release_path}?per_page=100&page=1"

Expand All @@ -27,7 +27,7 @@ function get_latest_release() {
response_headers=$(echo "${response}" | awk 'BEGIN {RS="\r\n\r\n"} NR==2 {print}')
response_body=$(echo "${response}" | awk 'BEGIN {RS="\r\n\r\n"} NR==3 {print}')
fi

# get the last page of releases from headers
last_page=$(echo "${response_headers}" | grep '^link:' | sed -e 's/^link:.*page=//g' -e 's/>.*$//g')

Expand All @@ -36,7 +36,7 @@ function get_latest_release() {
# Downside is that selecting official releases only isn't possible, while pre-release
# selection is possible given specific enough prefix, like v1.3.0-pre
release_tag=$(echo "${response_body}" | jq ".[].name" -r | grep -E "${release}" -m 1)

# If release_tag is not found in the first page(100 releases), this condition checks from second to last_page
# until release_tag is found
if [ -z "${release_tag}" ]; then
Expand All @@ -52,15 +52,15 @@ function get_latest_release() {
break
fi
done
fi
fi

set -x

# if release_tag is not found
if [ -z "${release_tag}" ]; then
echo "Error: release is not found from ${release_path}"
exit 1
else
else
echo "${release_tag}"
fi
}
Expand All @@ -70,10 +70,7 @@ CAPM3RELEASEPATH="{https://api.github.com/repos/${CAPM3_BASE_URL:-metal3-io/clus
CAPIRELEASEPATH="{https://api.github.com/repos/${CAPI_BASE_URL:-kubernetes-sigs/cluster-api}/releases}"

# CAPM3, CAPI and BMO releases
if [ "${CAPM3RELEASEBRANCH}" = "release-1.3" ]; then
export CAPM3RELEASE="${CAPM3RELEASE:-$(get_latest_release "${CAPM3RELEASEPATH}" "v1.3.")}"
export CAPIRELEASE="${CAPIRELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "v1.3.")}"
elif [ "${CAPM3RELEASEBRANCH}" = "release-1.4" ]; then
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
Expand Down

0 comments on commit b2aa443

Please sign in to comment.