From 6118aef84c182b5a1c86cf54f5f6cea61d0a1a3b Mon Sep 17 00:00:00 2001 From: Jacob Lindgren Date: Tue, 14 Oct 2025 19:58:56 -0500 Subject: [PATCH 1/3] [testing] pointing at script updates on r/r --- scripts/fetch-provisioning-tests | 6 ++++-- scripts/provisioning-tests | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/fetch-provisioning-tests b/scripts/fetch-provisioning-tests index 081ba946c..5bfa8153e 100755 --- a/scripts/fetch-provisioning-tests +++ b/scripts/fetch-provisioning-tests @@ -28,8 +28,10 @@ mkdir -p rancher # Although using the commit so the image matches the source code, use the default branch associated with that release line # Git clones must have a branch, and the release branch is likely to contain the commit anyway -GIT_URL=${GIT_URL:-https://github.com/rancher/rancher.git} -GIT_BRANCH=${GIT_BRANCH:-release/v2.12} +# GIT_URL=${GIT_URL:-https://github.com/rancher/rancher.git} +# GIT_BRANCH=${GIT_BRANCH:-release/v2.12} +GIT_URL=${GIT_URL:-https://github.com/tashima42/rancher.git} +GIT_BRANCH=${GIT_BRANCH:-remove-unused-build-scripts} git clone --depth 1 -b $GIT_BRANCH $GIT_URL ./rancher diff --git a/scripts/provisioning-tests b/scripts/provisioning-tests index bc79a495f..d68c842cc 100755 --- a/scripts/provisioning-tests +++ b/scripts/provisioning-tests @@ -36,9 +36,9 @@ fi # To be removed/changed once drone setup is removed from rancher/rancher repo. export DRONE_BUILD_NUMBER=${GITHUB_RUN_NUMBER} -if ! ./scripts/test-run-required.sh; then - exit -fi +# if ! ./scripts/test-run-required.sh; then +# exit +# fi set -ex From 66ad54bbc30083fa622d470b2250193b0d4938ca Mon Sep 17 00:00:00 2001 From: Pedro Tashima Date: Wed, 15 Oct 2025 18:45:59 -0300 Subject: [PATCH 2/3] remove rancher commit change --- scripts/fetch-provisioning-tests | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/fetch-provisioning-tests b/scripts/fetch-provisioning-tests index 5bfa8153e..47c9653d0 100755 --- a/scripts/fetch-provisioning-tests +++ b/scripts/fetch-provisioning-tests @@ -15,14 +15,14 @@ IMAGE_REPO=${IMAGE_REPO:-rancher/rancher} IMAGE_TAG=${IMAGE_TAG:-v2.12-head} IMAGE=${IMAGE:-$IMAGE_REPO:$IMAGE_TAG} -# Inspect image, get server version and extract rancher commit -if [ -n "$RANCHER_COMMIT" ]; then - RANCHER_COMMIT=$(awk -F '=' '{print $2}' <<< "$CATTLE_SERVER_VERSION") - case $RANCHER_COMMIT in *-head) - # If the rancher commit ends with '-head', it is usually of the form 'v2.x--head', so extract everything between dashes - RANCHER_COMMIT=$(awk -F '[-]' '{print $2}' <<< "$RANCHER_COMMIT");; - esac -fi +# Inspect image, get server version and extract rancher commit +# if [ -n "$RANCHER_COMMIT" ]; then +# RANCHER_COMMIT=$(awk -F '=' '{print $2}' <<< "$CATTLE_SERVER_VERSION") +# case $RANCHER_COMMIT in *-head) +# # If the rancher commit ends with '-head', it is usually of the form 'v2.x--head', so extract everything between dashes +# RANCHER_COMMIT=$(awk -F '[-]' '{print $2}' <<< "$RANCHER_COMMIT");; +# esac +# fi mkdir -p rancher @@ -40,7 +40,7 @@ export RANCHER_DIR=$TMP_DIR/rancher # Checkout commit image was built on pushd ./rancher -git checkout $RANCHER_COMMIT +# git checkout $RANCHER_COMMIT mkdir -p "$RANCHER_DIR/bin" From 21ea69796c95e57640b0a1994b19fd02c9c52c68 Mon Sep 17 00:00:00 2001 From: Pedro Tashima Date: Wed, 15 Oct 2025 18:47:13 -0300 Subject: [PATCH 3/3] remove tests --- .github/workflows/provisioning-tests.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/provisioning-tests.yaml b/.github/workflows/provisioning-tests.yaml index 9dd3a1fd0..a68f92118 100644 --- a/.github/workflows/provisioning-tests.yaml +++ b/.github/workflows/provisioning-tests.yaml @@ -27,9 +27,12 @@ jobs: strategy: fail-fast: false matrix: - dist: [rke2, k3s] - k8s-minor: [31, 32, 33] - test-regex: ["^Test_Provisioning_.*$", "^Test_Operation_SetA_.*$", "^Test_Operation_SetB_.*$"] + dist: [k3s] + # dist: [rke2, k3s] + k8s-minor: [33] + # k8s-minor: [31, 32, 33] + test-regex: ["^Test_Provisioning_.*$"] + # test-regex: ["^Test_Provisioning_.*$", "^Test_Operation_SetA_.*$", "^Test_Operation_SetB_.*$"] steps: - name: Force Install GIT latest run: |