Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Exit 0 if release job has already tagged a repo.
[releng/global-jjb.git]
/
shell
/
release-job.sh
diff --git
a/shell/release-job.sh
b/shell/release-job.sh
index
a0e6b44
..
ad118de
100644
(file)
--- a/
shell/release-job.sh
+++ b/
shell/release-job.sh
@@
-34,6
+34,7
@@
if [ "${LOGS_SERVER}" == 'None' ]; then
exit 1
fi
exit 1
fi
+NEXUSPROXY="${NEXUSPROXY:-None}"
NEXUS_URL="${NEXUSPROXY:-$NEXUS_URL}"
# Fetch the release-schema.yaml
NEXUS_URL="${NEXUSPROXY:-$NEXUS_URL}"
# Fetch the release-schema.yaml
@@
-54,14
+55,14
@@
echo "--> Verifying $release_file schema."
lftools schema verify $release_file release-schema.yaml
VERSION="$(niet ".version" "$release_file")"
lftools schema verify $release_file release-schema.yaml
VERSION="$(niet ".version" "$release_file")"
-PROJECT="$(niet ".project" "$release_file")"
LOG_DIR="$(niet ".log_dir" "$release_file")"
LOG_DIR="$(niet ".log_dir" "$release_file")"
-
NEXUS_PATH="${SILO}/${JENKINS_HOSTNAME}/"
LOGS_URL="${LOGS_SERVER}/${NEXUS_PATH}${LOG_DIR}"
PATCH_DIR="$(mktemp -d)"
NEXUS_PATH="${SILO}/${JENKINS_HOSTNAME}/"
LOGS_URL="${LOGS_SERVER}/${NEXUS_PATH}${LOG_DIR}"
PATCH_DIR="$(mktemp -d)"
-wget --quiet -P "$PATCH_DIR" "${LOGS_URL}"staging-repo.txt.gz
+LOGS_URL=${LOGS_URL%/} # strip any trailing '/'
+echo "wget -P "$PATCH_DIR" "${LOGS_URL}/"staging-repo.txt.gz"
+wget -P "$PATCH_DIR" "${LOGS_URL}/"staging-repo.txt.gz
nexus_release(){
for staging_url in $(zcat "$PATCH_DIR"/staging-repo.txt.gz | awk -e '{print $2}'); do
nexus_release(){
for staging_url in $(zcat "$PATCH_DIR"/staging-repo.txt.gz | awk -e '{print $2}'); do
@@
-89,12
+90,14
@@
echo "NEXUSPROXY: $NEXUSPROXY"
echo "JENKINS_HOSTNAME: $JENKINS_HOSTNAME"
echo "SILO: $SILO"
echo "PROJECT: $PROJECT"
echo "JENKINS_HOSTNAME: $JENKINS_HOSTNAME"
echo "SILO: $SILO"
echo "PROJECT: $PROJECT"
+echo "PROJECT-DASHED: ${PROJECT//\//-}"
+
echo "VERSION: $VERSION"
echo "VERSION: $VERSION"
-echo "PROJECT: $PROJECT"
echo "LOG DIR: $LOG_DIR"
pushd "$PATCH_DIR"
echo "LOG DIR: $LOG_DIR"
pushd "$PATCH_DIR"
- wget --quiet "${LOGS_URL}"/patches/{"${PROJECT}".bundle,taglist.log.gz}
+ echo "wget "${LOGS_URL}"/patches/{"${PROJECT//\//-}".bundle,taglist.log.gz}"
+ wget "${LOGS_URL}"/patches/{"${PROJECT//\//-}".bundle,taglist.log.gz}
gunzip taglist.log.gz
cat "$PATCH_DIR"/taglist.log
popd
gunzip taglist.log.gz
cat "$PATCH_DIR"/taglist.log
popd
@@
-109,10
+112,16
@@
if [[ ! $VERSION =~ $allowed_version_regex ]]; then
exit 1
fi
exit 1
fi
+if git tag -v "$VERSION"; then
+ echo "Repo already tagged $VERSION"
+ echo "This job has already run exit 0"
+ exit 0
+if
+
git checkout "$(awk '{print $NF}' "$PATCH_DIR/taglist.log")"
git fetch "$PATCH_DIR/$PROJECT.bundle"
git merge --ff-only FETCH_HEAD
git checkout "$(awk '{print $NF}' "$PATCH_DIR/taglist.log")"
git fetch "$PATCH_DIR/$PROJECT.bundle"
git merge --ff-only FETCH_HEAD
-git tag -am "$
PROJECT
$VERSION" "$VERSION"
+git tag -am "$
{PROJECT//\//-}
$VERSION" "$VERSION"
sigul --batch -c "$SIGUL_CONFIG" sign-git-tag "$SIGUL_KEY" "$VERSION" < "$SIGUL_PASSWORD"
echo "Showing latest signature for $PROJECT:"
sigul --batch -c "$SIGUL_CONFIG" sign-git-tag "$SIGUL_KEY" "$VERSION" < "$SIGUL_PASSWORD"
echo "Showing latest signature for $PROJECT:"
@@
-124,7
+133,7
@@
git tag -v "$VERSION"
if [[ "$JOB_NAME" =~ "merge" ]]; then
echo "Running merge"
gerrit_ssh=$(echo "$GERRIT_URL" | awk -F"/" '{print $3}')
if [[ "$JOB_NAME" =~ "merge" ]]; then
echo "Running merge"
gerrit_ssh=$(echo "$GERRIT_URL" | awk -F"/" '{print $3}')
- git remote set-url origin ssh://"$RELEASE_USERNAME"@"$gerrit_ssh":29418/
$GERRIT_PROJECT
+ git remote set-url origin ssh://"$RELEASE_USERNAME"@"$gerrit_ssh":29418/
"$PROJECT"
git config user.name "$RELEASE_USERNAME"
git config user.email "$RELEASE_EMAIL"
echo -e "Host $gerrit_ssh\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
git config user.name "$RELEASE_USERNAME"
git config user.email "$RELEASE_EMAIL"
echo -e "Host $gerrit_ssh\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config