Skip to content

Commit

Permalink
telco5g: Fix origin tests for 4.15 and 4.14 branches (#44503)
Browse files Browse the repository at this point in the history
  • Loading branch information
sshnaidm authored Oct 18, 2023
1 parent 60d0f36 commit ee5753d
Showing 1 changed file with 8 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ SSH_PKEY=~/key
cp "$SSH_PKEY_PATH" "$SSH_PKEY"
chmod 600 "$SSH_PKEY"

if [[ "$T5CI_VERSION" == "4.14" ]]; then
export CNF_BRANCH="master"
elif [[ "$T5CI_VERSION" == "4.15" ]]; then
if [[ "$T5CI_VERSION" == "4.15" ]]; then
export CNF_BRANCH="master"
else
export CNF_BRANCH="release-${T5CI_VERSION}"
Expand All @@ -37,6 +35,13 @@ cd "$cnf_dir" || exit 1
echo "running on branch ${CNF_BRANCH}"
git clone -b "${CNF_BRANCH}" "${CNF_REPO}" cnf-features-deploy
cd cnf-features-deploy
if [[ "$T5CI_VERSION" == "4.15" ]]; then
echo "Updating all submodules for >=4.15 versions"
# git version 1.8 doesn't work well with forked repositories, requires a specific branch to be set
sed -i "s@https://github.com/openshift/metallb-operator.git@https://github.com/openshift/metallb-operator.git\n branch = main@" .gitmodules
git submodule update --init --force --recursive --remote
git submodule foreach --recursive 'echo $path `git config --get remote.origin.url` `git rev-parse HEAD`' | grep -v Entering > ${ARTIFACT_DIR}/hashes.txt || true
fi
oc patch OperatorHub cluster --type json -p '[{"op": "add", "path": "/spec/disableAllDefaultSources", "value": true}]'

FEATURES_ENVIRONMENT="ci" make feature-deploy-on-ci 2>&1 | tee "${SHARED_DIR}/cnf-tests-run.log"
Expand Down

0 comments on commit ee5753d

Please sign in to comment.