X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Frelease-job.sh;h=5ee06f559b55cbfec8ea0db2b89ac9ceebb02dc0;hb=19cb59a5d60873873f6905b97266a8e919796dbc;hp=5b937265740a86d460d3078740027524f989a24b;hpb=54932faaba0a4de202d642e529dd74e4d6a6fbde;p=releng%2Fglobal-jjb.git

diff --git a/shell/release-job.sh b/shell/release-job.sh
index 5b937265..5ee06f55 100644
--- a/shell/release-job.sh
+++ b/shell/release-job.sh
@@ -11,224 +11,374 @@
 echo "---> release-job.sh"
 set -eu -o pipefail
 
-#Python bits. Remove when centos 7.7 builder is avaliable.
-if [ -d "/opt/pyenv" ]; then
-    echo "---> Setting up pyenv"
-    export PYENV_ROOT="/opt/pyenv"
-    export PATH="$PYENV_ROOT/bin:$PATH"
-fi
-PYTHONPATH=$(pwd)
-export PYTHONPATH
-pyenv local 3.6.4
-export PYENV_VERSION="3.6.4"
-pip install --user lftools[nexus] jsonschema niet yq
+echo "INFO: creating virtual environment"
+virtualenv -p python3 /tmp/venv
+PATH=/tmp/venv/bin:$PATH
+pipup="python -m pip install -q --upgrade pip lftools[nexus] jsonschema niet twine yq"
+echo "INFO: $pipup"
+$pipup
 
 #Functions.
+
+set_variables_common(){
+    echo "INFO: Setting all common variables"
+    LOGS_SERVER="${LOGS_SERVER:-None}"
+    if [ "${LOGS_SERVER}" == 'None' ]; then
+        echo "ERROR: 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 "$GIT_COMMIT" --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 "INFO: 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
+
+    PATCH_DIR="$(mktemp -d)"
+
+    # Displaying Release Information (Common variables)
+    printf "\t%-30s\n" RELEASE_ENVIRONMENT_INFO:
+    printf "\t%-30s %s\n" RELEASE_FILE: $release_file
+    printf "\t%-30s %s\n" LOGS_SERVER: $LOGS_SERVER
+    printf "\t%-30s %s\n" NEXUS_PATH: $NEXUS_PATH
+    printf "\t%-30s %s\n" JENKINS_HOSTNAME: $JENKINS_HOSTNAME
+    printf "\t%-30s %s\n" SILO: $SILO
+    printf "\t%-30s %s\n" PROJECT: $PROJECT
+    printf "\t%-30s %s\n" PROJECT-DASHED: ${PROJECT//\//-}
+    printf "\t%-30s %s\n" 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 '/'
+
+    # Continuing displaying Release Information (Maven)
+    printf "\t%-30s\n" RELEASE_MAVEN_INFO:
+    printf "\t%-30s %s\n" VERSION: $VERSION
+    printf "\t%-30s %s\n" LOG_DIR: $LOG_DIR
+    printf "\t%-30s %s\n" LOGS_URL: $LOGS_URL
+}
+
+set_variables_container(){
+    VERSION="${VERSION:-None}"
+    if [[ $VERSION == "None" ]]; then
+        VERSION="$(niet ".container_release_tag" "$release_file")"
+    fi
+    if grep -q "container_pull_registry" "$release_file" ; then
+        CONTAINER_PULL_REGISTRY="$(niet ".container_pull_registry" "$release_file")"
+    fi
+    if grep -q "container_push_registry" "$release_file" ; then
+        CONTAINER_PUSH_REGISTRY="$(niet ".container_push_registry" "$release_file")"
+    fi
+    # Make sure both pull and push registries are defined
+    if [ -z ${CONTAINER_PULL_REGISTRY+x} ] || [ -z ${CONTAINER_PUSH_REGISTRY+x} ]; then
+        echo "ERROR: CONTAINER_PULL_REGISTRY and CONTAINER_PUSH_REGISTRY need to be defined"
+        exit 1
+    fi
+    ref="$(niet ".ref" "$release_file")"
+
+    # Continuing displaying Release Information (Container)
+    printf "\t%-30s\n" RELEASE_CONTAINER_INFO:
+    printf "\t%-30s %s\n" CONTAINER_RELEASE_TAG: $VERSION
+    printf "\t%-30s %s\n" CONTAINER_PULL_REGISTRY: $CONTAINER_PULL_REGISTRY
+    printf "\t%-30s %s\n" CONTAINER_PUSH_REGISTRY: $CONTAINER_PUSH_REGISTRY
+    printf "\t%-30s %s\n" GERRIT_REF_TO_TAG: $ref
+}
+
+set_variables_pypi(){
+    # use Jenkins parameter if set; else get value from release file
+    echo "INFO: Setting pypi variables"
+    LOG_DIR="${LOG_DIR:-None}"
+    if [[ $LOG_DIR == "None" ]]; then
+        LOG_DIR="$(yq -er .log_dir "$release_file")"
+    fi
+    LOGS_URL="${LOGS_SERVER}/${NEXUS_PATH}${LOG_DIR}"
+    LOGS_URL=${LOGS_URL%/}  # strip any trailing '/'
+    PYPI_PROJECT="${PYPI_PROJECT:-None}"
+    if [[ $PYPI_PROJECT == "None" ]]; then
+        PYPI_PROJECT="$(yq -er .pypi_project "$release_file")"
+    fi
+    PYTHON_VERSION="${PYTHON_VERSION:-None}"
+    if [[ $PYTHON_VERSION == "None" ]]; then
+        PYTHON_VERSION="$(yq -er .python_version "$release_file")"
+    fi
+    VERSION="${VERSION:-None}"
+    if [[ $VERSION == "None" ]]; then
+        VERSION="$(yq -er .version "$release_file")"
+    fi
+
+    # Continuing displaying Release Information (pypi)
+    printf "\t%-30s\n" RELEASE_PYPI_INFO:
+    printf "\t%-30s %s\n" LOG_DIR: "$LOG_DIR"
+    printf "\t%-30s %s\n" LOGS_URL: "$LOGS_URL"
+    printf "\t%-30s %s\n" PYPI_INDEX: "$PYPI_INDEX" # from job configuration
+    printf "\t%-30s %s\n" PYPI_PROJECT: "$PYPI_PROJECT"
+    printf "\t%-30s %s\n" PYTHON_VERSION: "$PYTHON_VERSION"
+    printf "\t%-30s %s\n" VERSION: "$VERSION"
+}
+
 verify_schema(){
-  echo "---> INFO: Verifying $release_file schema."
-  lftools schema verify "$release_file" "$RELEASE_SCHEMA"
-  # 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
+    echo "INFO: Verifying $release_file schema."
+    lftools schema verify "$release_file" "$RELEASE_SCHEMA"
+}
+
+verify_version(){
+    # Verify allowed patterns "v#.#.#" or "#.#.#" aka SemVer
+    echo "INFO: Verifying version string $VERSION"
+    allowed_version_regex="^((v?)([0-9]+)\.([0-9]+)\.([0-9]+))$"
+    if [[ $VERSION =~ $allowed_version_regex ]]; then
+        echo "INFO: The version $VERSION is a valid semantic version"
+    else
+        echo "INFO: The version $VERSION is not a semantic valid version"
+        echo "INFO: Allowed versions are \"v#.#.#\" or \"#.#.#\" aka SemVer"
+        echo "INFO: See https://semver.org/ for more details on SemVer"
+        exit 1
+    fi
+}
+
+verify_version_match_release(){
+    wget -P /tmp "${LOGS_URL}/"console.log.gz
+    echo "INFO: Comparing version $VERSION with log snippet from maven-stage:"
+    if zgrep "Successfully uploaded" /tmp/console.log.gz | grep "$VERSION"; then
+        echo "INFO: version $VERSION matches maven-stage artifacts"
+    else
+        echo "ERROR: Defined version in release file does not match staging repo artifacts version to be released"
+        echo "       Please make sure maven-stage job selected as candidate and release version are correct"
+        exit 1
+    fi
+}
+
+# check prerequisites to detect mistakes in the release YAML file
+verify_pypi_match_release(){
+    wget -q -P /tmp "${LOGS_URL}/"console.log.gz
+    echo "INFO: Searching for strings >$PYPI_PROJECT< and >$VERSION< in job log"
+    # pypi-upload.sh generates success message with file list
+    if zgrep -i "uploaded" /tmp/console.log.gz | grep "$PYPI_PROJECT" | grep "$VERSION" ; then
+        echo "INFO: found expected strings in job log"
+    else
+        echo "ERROR: failed to find expected strings in job log"
+        exit 1
+    fi
 }
 
+# sigul is only available on Centos
+# TODO: write tag_github function
 tag(){
-  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:"
+    # Import public signing key
     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"
-    fi
-  fi
+    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 "INFO: Showing latest signature for $PROJECT:"
+        echo "INFO: git tag -v $VERSION"
+        git tag -v "$VERSION"
+
+        ########## Merge Part ##############
+        if [[ "$JOB_NAME" =~ "merge" ]] && [[ "$DRY_RUN" = false ]]; then
+            echo "INFO: Running merge, pushing tag"
+            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
 }
 
 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 "INFO: Running Nexus Verify"
+        lftools nexus release -v --server https://"$NEXUS_URL" "$STAGING_REPO"
+        echo "INFO: Merge will run:"
+        echo "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}')"
-
-
-  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%\"}"
-
-    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
-
-  ref="$(niet ".ref" "$release_file")"
-  echo "---> INFO: Merge will tag ref: $ref"
-  git checkout "$ref"
-  tag
+    #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 "INFO: Promoting $STAGING_REPO on $NEXUS_URL."
+          lftools nexus release --server https://"$NEXUS_URL" "$STAGING_REPO"
+        done
+    fi
 }
 
-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
-}
+container_release_file(){
+    echo "INFO: Processing container release"
+    local lfn_umbrella
+    lfn_umbrella="$(echo "$GERRIT_HOST" | awk -F"." '{print $2}')"
 
-echo "########### Start Script release-job.sh ###################################"
-echo "---> INFO: Setting all VARS"
+    for namequoted in $(cat $release_file | yq '.containers[].name'); do
+        versionquoted=$(cat $release_file | yq ".containers[] |select(.name==$namequoted) |.version")
 
-LOGS_SERVER="${LOGS_SERVER:-None}"
-if [ "${LOGS_SERVER}" == 'None' ]; then
-    echo "FAILED: log server not found"
-    exit 1
-fi
+        #Remove extra yaml quotes
+        name="${namequoted#\"}"
+        name="${name%\"}"
+        version="${versionquoted#\"}"
+        version="${version%\"}"
 
-if $USE_RELEASE_FILE ; then
+        echo "$name"
+        echo "$version"
+        echo "INFO: Merge will release $name $version as $VERSION"
+        # Attempt to pull from releases registry to see if the image has been released.
+        if docker pull "$CONTAINER_PUSH_REGISTRY"/"$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 "$CONTAINER_PULL_REGISTRY"/"$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 $CONTAINER_PUSH_REGISTRY/$lfn_umbrella/$name:$VERSION"
+            echo "docker push $CONTAINER_PUSH_REGISTRY/$lfn_umbrella/$name:$VERSION"
+            if [[ "$JOB_NAME" =~ "merge" ]]; then
+                docker tag "$container_image_id" "$CONTAINER_PUSH_REGISTRY"/"$lfn_umbrella"/"$name":"$VERSION"
+                docker push "$CONTAINER_PUSH_REGISTRY"/"$lfn_umbrella"/"$name":"$VERSION"
+            fi
+            echo "#########################"
+        fi
+    done
 
-  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
+    echo "INFO: Merge will tag ref: $ref"
+    git checkout "$ref"
+    tag
+}
 
-else
-  echo "This job is built with parameters, no release file needed. Continuing..."
-  release_file="None"
-fi
+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
+}
 
+# calls pip to download binary and source distributions from the specified index,
+# which requires a recent-in-2019 version.  Uploads the files it received.
+pypi_release_file(){
+    tgtdir=dist
+    mkdir $tgtdir
+    pip_pfx="pip download -d $tgtdir --no-deps --python-version $PYTHON_VERSION -i $PYPI_INDEX"
+    module="$PYPI_PROJECT==$VERSION"
+    pip_bin="$pip_pfx $module"
+    echo "INFO: downloading binary: $pip_bin"
+    if ! $pip_bin ; then
+        echo "WARN: failed to download binary distribution"
+    fi
+    pip_src="$pip_pfx --no-binary=:all: $module"
+    echo "INFO: downloading source: $pip_src"
+    if ! $pip_src ; then
+        echo "WARN: failed to download source distribution"
+    fi
+    echo "INFO: Checking files in $tgtdir"
+    filecount=$(ls $tgtdir | wc -l)
+    if [[ $filecount = 0 ]] ; then
+        echo "ERROR: no files downloaded"
+        exit 1
+    else
+        # shellcheck disable=SC2046
+        echo "INFO: downloaded $filecount distributions: " $(ls $tgtdir)
+    fi
 
-NEXUS_PATH="${SILO}/${JENKINS_HOSTNAME}/"
+    if [[ ! "$JOB_NAME" =~ "merge" ]] ; then
+        echo "INFO: not a merge job, not uploading files"
+        return
+    fi
 
-VERSION="${VERSION:-None}"
-if [[ $VERSION == "None" ]]; then
-  VERSION="$(niet ".version" "$release_file")"
-fi
+    cmd="twine upload -r $REPOSITORY $tgtdir/*"
+    if $DRY_RUN; then
+        echo "INFO: dry-run is set, echoing command only"
+        echo "$cmd"
+    else
+        echo "INFO: uploading $filecount distributions to repo $REPOSITORY"
+        $cmd
+    fi
+    tag
+}
 
-LOG_DIR="${LOG_DIR:-None}"
-if [[ $LOG_DIR == "None" ]]; then
-  LOG_DIR="$(niet ".log_dir" "$release_file")"
-fi
+# Set common environment variables
+set_variables_common
 
-DISTRIBUTION_TYPE="${DISTRIBUTION_TYPE:-None}"
-if [[ $DISTRIBUTION_TYPE == "None" ]]; then
-  DISTRIBUTION_TYPE="$(niet ".distribution_type" "$release_file")"
-fi
+# Determine the type of release:
+#   - container, release-container-schema.yaml
+#   - maven, release-schema.yaml
+#   - pypi,  release-pypi-schema.yaml
 
-####
-LOGS_URL="${LOGS_SERVER}/${NEXUS_PATH}${LOG_DIR}"
-LOGS_URL=${LOGS_URL%/}  # strip any trailing '/'
-PATCH_DIR="$(mktemp -d)"
-#INFO
-echo "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 "VERSION: $VERSION"
-echo "LOG DIR: $LOG_DIR"
-echo "LOGS URL: $LOGS_URL"
-echo "DISTRIBUTION_TYPE: $DISTRIBUTION_TYPE"
-#Check if this is a container or maven release: release-container-schema.yaml vs release-schema.yaml
-
-#Logic to determine what we are releasing.
-##########################################
 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
-  maven_release_file
+    if $USE_RELEASE_FILE ; then
+        RELEASE_SCHEMA="release-schema.yaml"
+        echo "INFO: Fetching schema $RELEASE_SCHEMA"
+        wget -q https://raw.githubusercontent.com/lfit/releng-global-jjb/master/schema/release-schema.yaml
+        verify_schema
+    fi
+    set_variables_maven
+    verify_version
+    verify_version_match_release
+    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
-  container_release_file
+    if $USE_RELEASE_FILE ; then
+        RELEASE_SCHEMA="release-container-schema.yaml"
+        echo "INFO: Fetching schema $RELEASE_SCHEMA"
+        wget -q https://raw.githubusercontent.com/lfit/releng-global-jjb/master/schema/${RELEASE_SCHEMA}
+        verify_schema
+    fi
+    set_variables_container
+    verify_version
+    container_release_file
+elif [[ "$DISTRIBUTION_TYPE" == "pypi" ]]; then
+    if $USE_RELEASE_FILE ; then
+        RELEASE_SCHEMA="release-pypi-schema.yaml"
+        echo "INFO: Fetching schema $RELEASE_SCHEMA"
+        wget -q https://raw.githubusercontent.com/lfit/releng-global-jjb/master/schema/${RELEASE_SCHEMA}
+        verify_schema
+    fi
+    set_variables_pypi
+    verify_version
+    verify_pypi_match_release
+    pypi_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"
+    exit 1
 fi
-##########################################
 
-echo "########### End Script release-job.sh ###################################"
+echo "---> release-job.sh ends"