From ee4bb7fca08b26c6a2c0cfe53b8a5bcfb91c09d0 Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Thu, 7 Dec 2017 20:09:26 +0000 Subject: [PATCH] Revert "jjb/common: run-test-short-*: meaningful LAVA job names" Revert due to issues with jobs. This reverts commit 7ec5cece04ee2af16f224214e7c8e23212c08c54. Change-Id: I3e660f27485731b13bdf1959a9f441d81a3efaf9 --- jjb/common/include-agl-run-test-short-release.sh | 2 +- jjb/common/include-agl-run-test-short.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jjb/common/include-agl-run-test-short-release.sh b/jjb/common/include-agl-run-test-short-release.sh index 13a122e7..2af1cc4d 100644 --- a/jjb/common/include-agl-run-test-short-release.sh +++ b/jjb/common/include-agl-run-test-short-release.sh @@ -22,7 +22,7 @@ CREATE_ARGS+="--url ci " [[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION " BUILD_VERSION="AGL-gerrit-$RELEASE_BRANCH-$RELEASE_VERSION" [[ -e output/repo-manifest-r.txt.sha1 ]] && BUILD_VERSION+="-$(cat output/repo-manifest-r.txt.sha1)" -CREATE_ARGS+="--name AGL-gerrit-$RELEASE_BRANCH-$RELEASE_VERSION " +CREATE_ARGS+="--name AGL-gerrit " CREATE_ARGS+="--build-version $BUILD_VERSION " CREATE_ARGS+="--callback-from ${LAVA_LAB} " CREATE_ARGS+="--test all" diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh index f4fbd5b7..58273b99 100644 --- a/jjb/common/include-agl-run-test-short.sh +++ b/jjb/common/include-agl-run-test-short.sh @@ -22,7 +22,7 @@ CREATE_ARGS+="--url ci " [[ ! -z $GERRIT_PATCHSET_NUMBER ]] && CREATE_ARGS+="--patchset $GERRIT_PATCHSET_NUMBER " BUILD_VERSION="AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER" [[ -e output/repo-manifest-r.txt.sha1 ]] && BUILD_VERSION+="-$(cat output/repo-manifest-r.txt.sha1)" -CREATE_ARGS+="--name AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER " +CREATE_ARGS+="--name AGL-gerrit " CREATE_ARGS+="--build-version $BUILD_VERSION " CREATE_ARGS+="--callback-from ${LAVA_LAB} " CREATE_ARGS+="--test all" -- 2.16.6