From: Anil Belur <abelur@linuxfoundation.org>
Date: Sun, 8 Sep 2019 03:56:42 +0000 (+0530)
Subject: Fix self release script indent
X-Git-Tag: v0.43.0~3^2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=8866ed8c8eb1c6a905db9d0a494ebe19ee7ab056;p=releng%2Fglobal-jjb.git

Fix self release script indent

Use 4 spaces indent. This makes the code easily readable
and consistant with rest of the code in global-jjb.

Change-Id: I62edca97517fe456d0fe688e2826b0d0fce8432a
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---

diff --git a/shell/release-job.sh b/shell/release-job.sh
index 8384455e..785bda4e 100644
--- a/shell/release-job.sh
+++ b/shell/release-job.sh
@@ -26,203 +26,202 @@ pip install --user lftools[nexus] jsonschema niet yq
 #Functions.
 
 set_variables_common(){
-echo "---> INFO: Setting all common variables"
-LOGS_SERVER="${LOGS_SERVER:-None}"
-if [ "${LOGS_SERVER}" == 'None' ]; then
-    echo "FAILED: log server not found"
-    exit 1
-fi
-NEXUS_PATH="${SILO}/${JENKINS_HOSTNAME}/"
-# Verify if using release file or parameters
-if $USE_RELEASE_FILE ; then
-  release_files=$(git diff-tree --no-commit-id -r "$GERRIT_PATCHSET_REVISION" --name-only -- "releases/" ".releases/")
-  if (( $(grep -c . <<<"$release_files") > 1 )); then
-    echo "---> INFO: RELEASE FILES ARE AS FOLLOWS: $release_files"
-    echo "---> ERROR: Committing multiple release files in the same commit OR rename/amend of existing files is not supported."
-    exit 1
-  else
-    release_file="$release_files"
-    echo "---> INFO: RELEASE FILE: $release_files"
-  fi
-else
-  echo "This job is built with parameters, no release file needed. Continuing..."
-  release_file="None"
-fi
+    echo "---> INFO: Setting all common variables"
+    LOGS_SERVER="${LOGS_SERVER:-None}"
+    if [ "${LOGS_SERVER}" == 'None' ]; then
+        echo "FAILED: log server not found"
+        exit 1
+    fi
+    NEXUS_PATH="${SILO}/${JENKINS_HOSTNAME}/"
+    # Verify if using release file or parameters
+    if $USE_RELEASE_FILE ; then
+        release_files=$(git diff-tree --no-commit-id -r "$GERRIT_PATCHSET_REVISION" --name-only -- "releases/" ".releases/")
+        if (( $(grep -c . <<<"$release_files") > 1 )); then
+          echo "---> INFO: RELEASE FILES ARE AS FOLLOWS: $release_files"
+          echo "---> ERROR: Committing multiple release files in the same commit OR rename/amend of existing files is not supported."
+          exit 1
+        else
+          release_file="$release_files"
+          echo "---> INFO: RELEASE FILE: $release_files"
+        fi
+    else
+        echo "This job is built with parameters, no release file needed. Continuing..."
+        release_file="None"
+    fi
 
-DISTRIBUTION_TYPE="${DISTRIBUTION_TYPE:-None}"
-if [[ $DISTRIBUTION_TYPE == "None" ]]; then
-  DISTRIBUTION_TYPE="$(niet ".distribution_type" "$release_file")"
-fi
+    DISTRIBUTION_TYPE="${DISTRIBUTION_TYPE:-None}"
+    if [[ $DISTRIBUTION_TYPE == "None" ]]; then
+        DISTRIBUTION_TYPE="$(niet ".distribution_type" "$release_file")"
+    fi
 
-PATCH_DIR="$(mktemp -d)"
+    PATCH_DIR="$(mktemp -d)"
 
-# Displaying Release Information (Common variables)
-echo "RELEASE ENVIRONMENT INFO:"
-echo "RELEASE_FILE: $release_file"
-echo "LOGS_SERVER: $LOGS_SERVER"
-echo "NEXUS_PATH: $NEXUS_PATH"
-echo "JENKINS_HOSTNAME: $JENKINS_HOSTNAME"
-echo "SILO: $SILO"
-echo "PROJECT: $PROJECT"
-echo "PROJECT-DASHED: ${PROJECT//\//-}"
-echo "DISTRIBUTION_TYPE: $DISTRIBUTION_TYPE"
+    # Displaying Release Information (Common variables)
+    echo "RELEASE ENVIRONMENT INFO:"
+    echo "RELEASE_FILE: $release_file"
+    echo "LOGS_SERVER: $LOGS_SERVER"
+    echo "NEXUS_PATH: $NEXUS_PATH"
+    echo "JENKINS_HOSTNAME: $JENKINS_HOSTNAME"
+    echo "SILO: $SILO"
+    echo "PROJECT: $PROJECT"
+    echo "PROJECT-DASHED: ${PROJECT//\//-}"
+    echo "DISTRIBUTION_TYPE: $DISTRIBUTION_TYPE"
 }
 
 set_variables_maven(){
-VERSION="${VERSION:-None}"
-if [[ $VERSION == "None" ]]; then
-  VERSION="$(niet ".version" "$release_file")"
-fi
-LOG_DIR="${LOG_DIR:-None}"
-if [[ $LOG_DIR == "None" ]]; then
-  LOG_DIR="$(niet ".log_dir" "$release_file")"
-fi
-LOGS_URL="${LOGS_SERVER}/${NEXUS_PATH}${LOG_DIR}"
-LOGS_URL=${LOGS_URL%/}  # strip any trailing '/'
+    VERSION="${VERSION:-None}"
+    if [[ $VERSION == "None" ]]; then
+        VERSION="$(niet ".version" "$release_file")"
+    fi
+    LOG_DIR="${LOG_DIR:-None}"
+    if [[ $LOG_DIR == "None" ]]; then
+        LOG_DIR="$(niet ".log_dir" "$release_file")"
+    fi
+    LOGS_URL="${LOGS_SERVER}/${NEXUS_PATH}${LOG_DIR}"
+    LOGS_URL=${LOGS_URL%/}  # strip any trailing '/'
 
-# Continuing displaying Release Information (Maven)
-echo "RELEASE MAVEN INFO:"
-echo "VERSION: $VERSION"
-echo "LOG DIR: $LOG_DIR"
-echo "LOGS URL: $LOGS_URL"
+    # Continuing displaying Release Information (Maven)
+    echo "RELEASE MAVEN INFO:"
+    echo "VERSION: $VERSION"
+    echo "LOG DIR: $LOG_DIR"
+    echo "LOGS URL: $LOGS_URL"
 }
 
 set_variables_container(){
-VERSION="${VERSION:-None}"
-if [[ $VERSION == "None" ]]; then
-  VERSION="$(niet ".container_release_tag" "$release_file")"
-fi
+    VERSION="${VERSION:-None}"
+    if [[ $VERSION == "None" ]]; then
+        VERSION="$(niet ".container_release_tag" "$release_file")"
+    fi
 
-ref="$(niet ".ref" "$release_file")"
+    ref="$(niet ".ref" "$release_file")"
 
-# Continuing displaying Release Information (Container)
-echo "RELEASE CONTAINER INFO:"
-echo "CONTAINER_RELEASE_TAG: $VERSION"
-echo "GERRIT_REF_TO_TAG: $ref"
+    # Continuing displaying Release Information (Container)
+    echo "RELEASE CONTAINER INFO:"
+    echo "CONTAINER_RELEASE_TAG: $VERSION"
+    echo "GERRIT_REF_TO_TAG: $ref"
 }
 
 verify_schema(){
-  echo "---> INFO: Verifying $release_file schema."
-  lftools schema verify "$release_file" "$RELEASE_SCHEMA"
+    echo "---> INFO: Verifying $release_file schema."
+    lftools schema verify "$release_file" "$RELEASE_SCHEMA"
 }
 
 verify_version(){
-  # Verify allowed versions
-  # Allowed versions are "v#.#.#" or "#.#.#" aka SemVer
-  allowed_version_regex="^((v?)([0-9]+)\.([0-9]+)\.([0-9]+))$"
-  if [[ ! $VERSION =~ $allowed_version_regex ]]; then
-    echo "The version $VERSION is not a semantic valid version"
-    echo "Allowed versions are \"v#.#.#\" or \"#.#.#\" aka SemVer"
-    echo "See https://semver.org/ for more details on SemVer"
-    exit 1
-  fi
+    # Verify allowed versions
+    # Allowed versions are "v#.#.#" or "#.#.#" aka SemVer
+    allowed_version_regex="^((v?)([0-9]+)\.([0-9]+)\.([0-9]+))$"
+    if [[ ! $VERSION =~ $allowed_version_regex ]]; then
+        echo "The version $VERSION is not a semantic valid version"
+        echo "Allowed versions are \"v#.#.#\" or \"#.#.#\" aka SemVer"
+        echo "See https://semver.org/ for more details on SemVer"
+        exit 1
+    fi
 }
 
 tag(){
-  if git tag -v "$VERSION"; then
-    echo "---> OK: Repo already tagged $VERSION Continuting to release"
-  else
+    if git tag -v "$VERSION"; then
+        echo "---> OK: Repo already tagged $VERSION Continuting to release"
+    else
+        echo "---> INFO: Repo has not yet been tagged $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:"
+        gpg --import "$SIGNING_PUBKEY"
+        echo "git tag -v $VERSION"
+        git tag -v "$VERSION"
 
-    echo "---> INFO: Repo has not yet been tagged $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:"
-    gpg --import "$SIGNING_PUBKEY"
-    echo "git tag -v $VERSION"
-    git tag -v "$VERSION"
-    ########## Merge Part ##############
-    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"
-      git config user.name "$RELEASE_USERNAME"
-      git config user.email "$RELEASE_EMAIL"
-      echo -e "Host $gerrit_ssh\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
-      chmod 600 ~/.ssh/config
-      git push origin "$VERSION"
+        ########## Merge Part ##############
+        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"
+            git config user.name "$RELEASE_USERNAME"
+            git config user.email "$RELEASE_EMAIL"
+            echo -e "Host $gerrit_ssh\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
+            chmod 600 ~/.ssh/config
+            git push origin "$VERSION"
+        fi
     fi
-  fi
 }
 
 nexus_release(){
-  for staging_url in $(zcat "$PATCH_DIR"/staging-repo.txt.gz | awk -e '{print $2}'); do
-    # extract the domain name from URL
-    NEXUS_URL=$(echo "$staging_url" | sed -e 's|^[^/]*//||' -e 's|/.*$||')
-    echo "---> INFO: NEXUS_URL: $NEXUS_URL"
-    # extract the staging repo from URL
-    STAGING_REPO=${staging_url#*repositories/}
-    echo "Running Nexus Verify"
-    lftools nexus release -v --server https://"$NEXUS_URL" "$STAGING_REPO"
-    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" ]] && [[ "$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/}
-      echo "Promoting $STAGING_REPO on $NEXUS_URL."
-      lftools nexus release --server https://"$NEXUS_URL" "$STAGING_REPO"
+        # extract the domain name from URL
+        NEXUS_URL=$(echo "$staging_url" | sed -e 's|^[^/]*//||' -e 's|/.*$||')
+        echo "---> INFO: NEXUS_URL: $NEXUS_URL"
+        # extract the staging repo from URL
+        STAGING_REPO=${staging_url#*repositories/}
+        echo "Running Nexus Verify"
+        lftools nexus release -v --server https://"$NEXUS_URL" "$STAGING_REPO"
+        echo "Merge will run"
+        echo "lftools nexus release --server https://$NEXUS_URL $STAGING_REPO"
     done
-  fi
+
+    #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/}
+          echo "Promoting $STAGING_REPO on $NEXUS_URL."
+          lftools nexus release --server https://"$NEXUS_URL" "$STAGING_REPO"
+        done
+    fi
 }
 
 container_release_file(){
-  echo "---> Processing container release"
-  local lfn_umbrella
-  lfn_umbrella="$(echo "$GERRIT_HOST" | awk -F"." '{print $2}')"
+    echo "---> Processing container release"
+    local lfn_umbrella
+    lfn_umbrella="$(echo "$GERRIT_HOST" | awk -F"." '{print $2}')"
 
+    for namequoted in $(cat $release_file | yq '.containers[].name'); do
+        versionquoted=$(cat $release_file | yq ".containers[] |select(.name=="$namequoted") |.version")
 
-  for namequoted in $(cat $release_file | yq '.containers[].name'); do
-    versionquoted=$(cat $release_file | yq ".containers[] |select(.name=="$namequoted") |.version")
+        #Remove extra yaml quotes
+        name="${namequoted#\"}"
+        name="${name%\"}"
+        version="${versionquoted#\"}"
+        version="${version%\"}"
 
-    #Remove extra yaml quotes
-    name="${namequoted#\"}"
-    name="${name%\"}"
-    version="${versionquoted#\"}"
-    version="${version%\"}"
-
-    echo "$name"
-    echo "$version"
-    echo "---> INFO: Merge will release $name $version as $VERSION"
-    #Pull from public, to see if we have already tagged this.
-    if docker pull "$DOCKER_REGISTRY":10002/"$lfn_umbrella"/"$name":"$VERSION"; then
-      echo "---> OK: $VERSION is already released for image $name, Continuing..."
-    else
-      echo "---> OK: $VERSION not found in releases, release will be prepared. Continuing..."
-      docker pull "$DOCKER_REGISTRY":10001/"$lfn_umbrella"/"$name":"$version"
-      container_image_id="$(docker images | grep $name | grep $version | awk '{print $3}')"
-      echo "---> INFO: Merge will run the following commands:"
-      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"
-      fi
-      echo "#########################"
-    fi
-  done
+        echo "$name"
+        echo "$version"
+        echo "---> INFO: Merge will release $name $version as $VERSION"
+        #Pull from public, to see if we have already tagged this.
+        if docker pull "$DOCKER_REGISTRY":10002/"$lfn_umbrella"/"$name":"$VERSION"; then
+            echo "---> OK: $VERSION is already released for image $name, Continuing..."
+        else
+            echo "---> OK: $VERSION not found in releases, release will be prepared. Continuing..."
+            docker pull "$DOCKER_REGISTRY":10001/"$lfn_umbrella"/"$name":"$version"
+            container_image_id="$(docker images | grep $name | grep $version | awk '{print $3}')"
+            echo "---> INFO: Merge will run the following commands:"
+            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"
+            fi
+            echo "#########################"
+        fi
+    done
 
-  echo "---> INFO: Merge will tag ref: $ref"
-  git checkout "$ref"
-  tag
+    echo "---> INFO: Merge will tag ref: $ref"
+    git checkout "$ref"
+    tag
 }
 
 maven_release_file(){
-  echo "---> INFO: wget -P $PATCH_DIR ${LOGS_URL}/staging-repo.txt.gz"
-  wget -P "$PATCH_DIR" "${LOGS_URL}/"staging-repo.txt.gz
-  pushd "$PATCH_DIR"
-    echo "---> INFO: 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
-  git checkout "$(awk '{print $NF}' "$PATCH_DIR/taglist.log")"
-  git fetch "$PATCH_DIR/${PROJECT//\//-}.bundle"
-  git merge --ff-only FETCH_HEAD
-  nexus_release
-  tag
+    echo "---> INFO: wget -P $PATCH_DIR ${LOGS_URL}/staging-repo.txt.gz"
+    wget -P "$PATCH_DIR" "${LOGS_URL}/"staging-repo.txt.gz
+    pushd "$PATCH_DIR"
+        echo "---> INFO: 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
+    git checkout "$(awk '{print $NF}' "$PATCH_DIR/taglist.log")"
+    git fetch "$PATCH_DIR/${PROJECT//\//-}.bundle"
+    git merge --ff-only FETCH_HEAD
+    nexus_release
+    tag
 }
 
 echo "########### Start Script release-job.sh ###################################"
@@ -235,25 +234,25 @@ echo "########### Start Script release-job.sh ##################################
 set_variables_common
 
 if [[ "$DISTRIBUTION_TYPE" == "maven" ]]; then
-  wget -q https://raw.githubusercontent.com/lfit/releng-global-jjb/master/schema/release-schema.yaml
-  RELEASE_SCHEMA="release-schema.yaml"
-  if $USE_RELEASE_FILE ; then
-    verify_schema
-  fi
-  set_variables_maven
-  verify_version
-  maven_release_file
+    wget -q https://raw.githubusercontent.com/lfit/releng-global-jjb/master/schema/release-schema.yaml
+    RELEASE_SCHEMA="release-schema.yaml"
+    if $USE_RELEASE_FILE ; then
+        verify_schema
+    fi
+    set_variables_maven
+    verify_version
+    maven_release_file
 elif [[ "$DISTRIBUTION_TYPE" == "container" ]]; then
-  wget -q https://raw.githubusercontent.com/lfit/releng-global-jjb/master/schema/release-container-schema.yaml
-  RELEASE_SCHEMA="release-container-schema.yaml"
-  verify_schema
-  set_variables_container
-  verify_version
-  container_release_file
+    wget -q https://raw.githubusercontent.com/lfit/releng-global-jjb/master/schema/release-container-schema.yaml
+    RELEASE_SCHEMA="release-container-schema.yaml"
+    verify_schema
+    set_variables_container
+    verify_version
+    container_release_file
 else
-  echo "---> ERROR: distribution_type: $DISTRIBUTION_TYPE not supported"
-  echo "Must be maven or container"
-  exit 1
+    echo "---> ERROR: distribution_type: $DISTRIBUTION_TYPE not supported"
+    echo "Must be maven or container"
+    exit 1
 fi
 ##########################################