X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Frelease-job.sh;h=fd43d7548fd2b0a45d47d616c3d2dca6040788ce;hb=5fe7f08ff027accd25c96df8bc3f88030f89ffb7;hp=3a36a579bb25f7fa2398e43d75b8d66878cade01;hpb=267b0ce4ac5ead9209ed889a76ddc3773fd1ff0d;p=releng%2Fglobal-jjb.git

diff --git a/shell/release-job.sh b/shell/release-job.sh
index 3a36a579..fd43d754 100644
--- a/shell/release-job.sh
+++ b/shell/release-job.sh
@@ -51,7 +51,7 @@ tag(){
     echo "git tag -v $VERSION"
     git tag -v "$VERSION"
     ########## Merge Part ##############
-    if [[ "$JOB_NAME" =~ "merge" ]]; then
+    if [[ "$JOB_NAME" =~ "merge" ]] && [[ "$DRY_RUN" = false ]]; then
       echo "--> INFO: Running merge"
       gerrit_ssh=$(echo "$GERRIT_URL" | awk -F"/" '{print $3}')
       git remote set-url origin ssh://"$RELEASE_USERNAME"@"$gerrit_ssh":29418/"$PROJECT"
@@ -76,9 +76,9 @@ nexus_release(){
     echo "Merge will run"
     echo "lftools nexus release --server https://$NEXUS_URL $STAGING_REPO"
   done
-  #Run the loop twice, to catch errors on either nexus repo
 
-  if [[ "$JOB_NAME" =~ "merge" ]]; then
+  #Run the loop twice, to catch errors on either nexus repo
+  if [[ "$JOB_NAME" =~ "merge" ]] && [[ "$DRY_RUN" = false ]]; then
     for staging_url in $(zcat "$PATCH_DIR"/staging-repo.txt.gz | awk -e '{print $2}'); do
       NEXUS_URL=$(echo "$staging_url" | sed -e 's|^[^/]*//||' -e 's|/.*$||')
       STAGING_REPO=${staging_url#*repositories/}
@@ -118,8 +118,8 @@ container_release_file(){
       echo "docker tag $container_image_id $DOCKER_REGISTRY:10002/$lfn_umbrella/$name:$VERSION"
       echo "docker push $DOCKER_REGISTRY:10002/$lfn_umbrella/$name:$VERSION"
       if [[ "$JOB_NAME" =~ "merge" ]]; then
-      docker tag "$container_image_id" "$DOCKER_REGISTRY":10002/"$lfn_umbrella"/"$name":"$VERSION"
-      docker push "$DOCKER_REGISTRY":10002/"$lfn_umbrella"/"$name":"$VERSION"
+        docker tag "$container_image_id" "$DOCKER_REGISTRY":10002/"$lfn_umbrella"/"$name":"$VERSION"
+        docker push "$DOCKER_REGISTRY":10002/"$lfn_umbrella"/"$name":"$VERSION"
       fi
       echo "#########################"
     fi