Skip to content

Commit

Permalink
Merge pull request #3977 from jenkins-x/current_tf
Browse files Browse the repository at this point in the history
fix: terraform repos get previous version
  • Loading branch information
jenkins-x-bot authored Oct 24, 2024
2 parents 6c8c222 + 3456fa5 commit e81f411
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions .lighthouse/jenkins-x/release/promote-vs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ declare -a tfrepos=(
"jx3-terraform-azure"
)

export SOURCE_DIR=$PWD
export TMPDIR=/tmp/jx3-gitops-promote
rm -rf $TMPDIR
mkdir -p $TMPDIR
Expand All @@ -42,7 +43,7 @@ function upgradeClusterRepo {
jx gitops kpt update
mkdir -p .lighthouse
kpt pkg get https://github.com/jenkins-x/jx3-pipeline-catalog.git/$2/.lighthouse/jenkins-x .lighthouse/jenkins-x
kpt pkg get https://github.com/jenkins-x/jxr-versions.git/ versionStream
kpt pkg get https://github.com/jenkins-x/jx3-versions.git/ versionStream
rm -rf versionStream/jenkins*.yml versionStream/jx versionStream/.github versionStream/.pre* versionStream/.secrets* versionStream/OWNER* versionStream/.lighthouse versionStream/.github
jx gitops helmfile resolve --update
jx gitops helmfile report
Expand All @@ -62,7 +63,7 @@ do
cd $TMPDIR
git clone https://github.com/jx3-gitops-repositories/$r.git
cd "$r"
jx gitops upgrade || true
jx gitops upgrade --version-stream-dir $SOURCE_DIR || true
git commit -a -m "chore: upgrade version stream" || true
git push || true
done
Expand All @@ -73,6 +74,6 @@ cd $TMPDIR
git clone https://github.com/jenkins-x/jx3-oss-cluster.git
cd "jx3-oss-cluster"
git checkout -b $LOCAL_BRANCH_NAME
jx gitops upgrade --commit-message "chore: version stream upgrade $VERSION"
jx gitops upgrade --version-stream-dir $SOURCE_DIR --commit-message "chore: version stream upgrade $VERSION"
git push origin $LOCAL_BRANCH_NAME
jx create pullrequest -t "chore: version stream upgrade $VERSION" -l updatebot

0 comments on commit e81f411

Please sign in to comment.