Skip to content

Commit

Permalink
GEODE-7911: fix release script issues encountered in 1.12.0 release (a…
Browse files Browse the repository at this point in the history
…pache#4850)

* GEODE-7911: fix release script issues

* GEODE-7911: install ssh and enable passwordless ssh to localhost as required for benchmarks tests

* GEODE-7911: if a release script encounters an error, make this very clear and suggest the proper way to recover

* GEODE-7911: do not produce stray geode-assembly/build/distributions/geode-assembly*.zip

(cherry picked from commit b1f84ea)
  • Loading branch information
onichols-pivotal authored and Ernie Burghardt committed Mar 26, 2020
1 parent 4ede81a commit 57f17bf
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 1 deletion.
10 changes: 9 additions & 1 deletion dev-tools/release/commit_rc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@ else
fi


function failMsg {
errln=$1
echo "ERROR: script did NOT complete successfully"
echo "Comment out any steps that already succeeded (approximately lines 80-$(( errln - 1 ))) and try again"
}
trap 'failMsg $LINENO' ERR


echo ""
echo "============================================================"
echo "Publishing artifacts to apache release location..."
Expand Down Expand Up @@ -102,7 +110,7 @@ echo "============================================================"
echo "Pushing tags..."
echo "============================================================"

for DIR in ${GEODE} ${GEODE_EXAMPLES} ${GEODE_NATIVE} ${GEODE_BENCHMARKS }; do
for DIR in ${GEODE} ${GEODE_EXAMPLES} ${GEODE_NATIVE} ${GEODE_BENCHMARKS} ; do
set -x
cd ${DIR}
git push origin rel/v${FULL_VERSION}
Expand Down
7 changes: 7 additions & 0 deletions dev-tools/release/deploy_rc_pipeline.sh
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,13 @@ jobs:
tar xzf src.tgz
cd apache-geode-benchmarks-${VERSION}-src
java -version
mkdir -p ~/.ssh
ssh-keygen -m PEM -b 2048 -t rsa -f ~/.ssh/id_rsa -q -N ""
cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
apt-get update
apt-get install openssh-server --no-install-recommends -y
echo "StrictHostKeyChecking no" >> /etc/ssh/ssh_config
service ssh start
./gradlew build test
- name: verify-keys
serial: true
Expand Down
8 changes: 8 additions & 0 deletions dev-tools/release/finalize_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@ else
fi


function failMsg {
errln=$1
echo "ERROR: script did NOT complete successfully"
echo "Comment out any steps that already succeeded (approximately lines 80-$(( errln - 1 ))) and try again"
}
trap 'failMsg $LINENO' ERR


echo ""
echo "============================================================"
echo "Destroying pipelines"
Expand Down
8 changes: 8 additions & 0 deletions dev-tools/release/prepare_rc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,14 @@ cd $WORKSPACE
set +x


function failMsg {
errln=$1
echo "ERROR: script did NOT complete successfully"
echo "Comment out any steps that already succeeded (approximately lines 124-$(( errln - 1 ))) and try again"
}
trap 'failMsg $LINENO' ERR


echo ""
echo "============================================================"
echo "Cloning repositories..."
Expand Down
8 changes: 8 additions & 0 deletions dev-tools/release/promote_rc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,14 @@ else
fi


function failMsg {
errln=$1
echo "ERROR: script did NOT complete successfully"
echo "Comment out any steps that already succeeded (approximately lines 94-$(( errln - 1 ))) and try again"
}
trap 'failMsg $LINENO' ERR


echo ""
echo "============================================================"
echo "Releasing artifacts to mirror sites..."
Expand Down
1 change: 1 addition & 0 deletions geode-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,7 @@ tasks.named('srcDistTar').configure {

[tasks.named('distZip'),
tasks.named('srcDistZip'),
tasks.named('dockerfileZip'),
]*.configure {
enabled = false
}
Expand Down

0 comments on commit 57f17bf

Please sign in to comment.