Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions .github/workflows/provisioning-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
24 changes: 13 additions & 11 deletions scripts/fetch-provisioning-tests
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,23 @@ 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-<COMMIT>-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-<COMMIT>-head', so extract everything between dashes
# RANCHER_COMMIT=$(awk -F '[-]' '{print $2}' <<< "$RANCHER_COMMIT");;
# esac
# fi

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

Expand All @@ -38,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"

Expand Down
6 changes: 3 additions & 3 deletions scripts/provisioning-tests
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading