X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Frelease-job.sh;h=6510ce5b26a1ff073772f7b9b1859893f9dc15b5;hb=refs%2Fchanges%2F77%2F16677%2F1;hp=0ada4617ec283b92fa575d0e2286e9d35c599e1e;hpb=d528f52b9ebd3c9982045e4cb754eb8bd0f1e007;p=releng%2Fglobal-jjb.git diff --git a/shell/release-job.sh b/shell/release-job.sh index 0ada4617..6510ce5b 100644 --- a/shell/release-job.sh +++ b/shell/release-job.sh @@ -151,8 +151,7 @@ if [ "${LOGS_SERVER}" == 'None' ]; then exit 1 fi -RELEASE_FILE="${RELEASE_FILE:-True}" -if [[ "$RELEASE_FILE" == "True" ]]; then +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 @@ -165,7 +164,7 @@ if [[ "$RELEASE_FILE" == "True" ]]; then fi else - echo "This is job is built with parameters, no release file needed" + echo "This job is built with parameters, no release file needed. Continuing..." release_file="None" fi @@ -211,7 +210,7 @@ echo "DISTRIBUTION_TYPE: $DISTRIBUTION_TYPE" 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 [[ "$RELEASE_FILE" == "True" ]]; then + if $USE_RELEASE_FILE ; then verify_schema fi maven_release_file