Skip to content

Commit

Permalink
Merge pull request #2136 from Nordix/peppi-lotta/set-unbound-env-vari…
Browse files Browse the repository at this point in the history
…ables-1.7

🐛 Use GOPROXY to download releases
  • Loading branch information
metal3-io-bot authored Dec 5, 2024
2 parents 9121715 + 1d6a67a commit 66810c9
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions scripts/ci-e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ export WORKING_DIR=/opt/metal3-dev-env
FORCE_REPO_UPDATE="${FORCE_REPO_UPDATE:-false}"

export CAPM3RELEASEBRANCH="${CAPM3RELEASEBRANCH:-main}"
CAPIGOPROXY="${CAPIGOPROXY:-https://proxy.golang.org/sigs.k8s.io/cluster-api/@v/list}"
CAPM3GOPROXY="${CAPM3GOPROXY:-https://proxy.golang.org/github.com/metal3-io/cluster-api-provider-metal3/@v/list}"

# Starting from CAPI v1.5.0 version cluster-api config folder location has changed
# to XDG_CONFIG_HOME folder. Following code defines the cluster-api config folder
Expand Down Expand Up @@ -79,11 +81,11 @@ source "${M3_DEV_ENV_PATH}/lib/ironic_tls_setup.sh"
# By default UPGRADE_FROM_RELEASE is v1.2. if not explicitly exported
export UPGRADE_FROM_RELEASE="${UPGRADE_FROM_RELEASE:-v1.2.}"
# Get latest capm3 patch for a minor version $UPGRADE_FROM_RELEASE
export CAPM3_FROM_RELEASE="${CAPM3_FROM_RELEASE:-$(get_latest_release "${CAPM3RELEASEPATH}" "${UPGRADE_FROM_RELEASE}")}"
export CAPM3_FROM_RELEASE="${CAPM3_FROM_RELEASE:-$(get_latest_release_from_goproxy "${CAPM3GOPROXY}" "${UPGRADE_FROM_RELEASE}")}"
# Get latest capi patch for the compatible version with capm3 $UPGRADE_FROM_RELEASE
CAPI_UPGRADE_FROM_RELEASE=${UPGRADE_FROM_RELEASE}

export CAPI_FROM_RELEASE="${CAPI_FROM_RELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "${CAPI_UPGRADE_FROM_RELEASE}")}"
export CAPI_FROM_RELEASE="${CAPI_FROM_RELEASE:-$(get_latest_release_from_goproxy "${CAPIGOPROXY}" "${CAPI_UPGRADE_FROM_RELEASE}")}"
# The e2e config file parameter for the capi release compatible with main (capm3 next version)
export CAPI_TO_RELEASE="${CAPIRELEASE}"
# K8s support based on https://cluster-api.sigs.k8s.io/reference/versions.html#core-provider-cluster-api-controller
Expand Down

0 comments on commit 66810c9

Please sign in to comment.