From 74ee11eff698b633dbf71fc70a84c523cd58b575 Mon Sep 17 00:00:00 2001 From: nicholasSSUSE Date: Tue, 26 Nov 2024 20:21:22 -0300 Subject: [PATCH] starting dev branch for 2.11 line --- .github/workflows/regsync-config.yaml | 2 +- configuration.yaml | 2 +- scripts/release-validation/diff-with-released.sh | 2 +- scripts/release-validation/last-released.sh | 2 +- scripts/release-validation/validate-annotations.sh | 4 ++-- scripts/version | 2 +- version_rules.json | 4 ++++ 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/regsync-config.yaml b/.github/workflows/regsync-config.yaml index 7c2560dd38..ea64aa7123 100644 --- a/.github/workflows/regsync-config.yaml +++ b/.github/workflows/regsync-config.yaml @@ -1,4 +1,4 @@ -# Generate-Regsync-Config action will run for every PR into release-v2.10 branch only after an approval is given +# Generate-Regsync-Config action will run for every PR into release-v2.11 branch only after an approval is given # It will run make target to generate regsync file and add a commit to the PR updating the regsync file. # It will then install and run regsync client and do the prime image mirroring. diff --git a/configuration.yaml b/configuration.yaml index ee800151b4..8e825d8803 100644 --- a/configuration.yaml +++ b/configuration.yaml @@ -3,4 +3,4 @@ helmRepo: validate: url: https://github.com/rancher/charts.git - branch: release-v2.10 + branch: release-v2.11 diff --git a/scripts/release-validation/diff-with-released.sh b/scripts/release-validation/diff-with-released.sh index 8cc13bf6ab..5804af1456 100755 --- a/scripts/release-validation/diff-with-released.sh +++ b/scripts/release-validation/diff-with-released.sh @@ -2,7 +2,7 @@ ROOT_DIR=../.. UPSTREAM_REMOTE=upstream -UPSTREAM_BRANCH=release-v2.10 +UPSTREAM_BRANCH=release-v2.11 OLD_CHART_DIR=$ROOT_DIR/charts NEW_CHART_DIR=$ROOT_DIR/to-be-released diff --git a/scripts/release-validation/last-released.sh b/scripts/release-validation/last-released.sh index f0c12ff93f..12da6b990c 100755 --- a/scripts/release-validation/last-released.sh +++ b/scripts/release-validation/last-released.sh @@ -6,7 +6,7 @@ ALREADY_RELEASED=$ROOT_DIR/already-released RELEASE_YAML_PATH=$ROOT_DIR/release.yaml UPSTREAM_REMOTE=upstream -UPSTREAM_BRANCH=release-v2.10 +UPSTREAM_BRANCH=release-v2.11 git fetch ${UPSTREAM_REMOTE} mv $CHART_DIR $TO_BE_RELEASED diff --git a/scripts/release-validation/validate-annotations.sh b/scripts/release-validation/validate-annotations.sh index eadb7708e5..432db6511d 100755 --- a/scripts/release-validation/validate-annotations.sh +++ b/scripts/release-validation/validate-annotations.sh @@ -5,8 +5,8 @@ ROOT_DIR=../.. ASSETS_DIR=$ROOT_DIR/assets INDEX_PATH=$ROOT_DIR/index.yaml UPSTREAM_REMOTE=upstream -UPSTREAM_BRANCH=release-v2.10 -OLD_UPSTREAM_BRANCH=release-v2.9 +UPSTREAM_BRANCH=release-v2.11 +OLD_UPSTREAM_BRANCH=release-v2.10 git fetch ${UPSTREAM_REMOTE} diff --git a/scripts/version b/scripts/version index 851af5f8c5..7d8597debf 100755 --- a/scripts/version +++ b/scripts/version @@ -2,4 +2,4 @@ set -e CHARTS_BUILD_SCRIPTS_REPO=https://github.com/rancher/charts-build-scripts.git -CHARTS_BUILD_SCRIPT_VERSION="${CHARTS_BUILD_SCRIPT_VERSION:-v1.1.0}" +CHARTS_BUILD_SCRIPT_VERSION="${CHARTS_BUILD_SCRIPT_VERSION:-v1.2.0}" diff --git a/version_rules.json b/version_rules.json index 803fd9b0fa..820ebd6e6c 100644 --- a/version_rules.json +++ b/version_rules.json @@ -2,6 +2,10 @@ "prod-branch-prefix": "release-v", "dev-branch-prefix": "dev-v", "rules": { + "2.11": { + "min": "106.0.0", + "max": "107.0.0" + }, "2.10": { "min": "105.0.0", "max": "106.0.0"