From 972acec5432f9615b61390afa2fda207c7625133 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Fri, 9 Apr 2021 12:07:34 +0000 Subject: SPEC-3414: provide file server resource option Use the new --fsr option of agl-publish. Change-Id: If22ea48de0eeb72267b243f88cdd57c81e76f046 Bug-AGL: SPEC-3414 Signed-off-by: Corentin LABBE --- jjb/common/include-agl-kci-publish-build-meta.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'jjb/common') diff --git a/jjb/common/include-agl-kci-publish-build-meta.sh b/jjb/common/include-agl-kci-publish-build-meta.sh index 5a79524a..b4dec252 100644 --- a/jjb/common/include-agl-kci-publish-build-meta.sh +++ b/jjb/common/include-agl-kci-publish-build-meta.sh @@ -12,23 +12,27 @@ kci-publish() { fi echo "DEBUG: GERRIT_PROJECT $GERRIT_PROJECT" + FSR="" # check GERRIT_PROJECT to find if we build an app or not if echo $GERRIT_PROJECT |grep -q apps ;then # for app BUILD_VERSION="AGL-app-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER" KERNEL_VERSION="$BUILD_VERSION" echo "APP: $BUILD_VERSION $KERNEL_VERSION" + FSR="AGL/snapshots/$GERRIT_BRANCH/latest/$TARGETMACHINE" else if [ -z "$RELEASE_BRANCH" ];then # for CI BUILD_VERSION="AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER" KERNEL_VERSION="$DIST_BUILD_TOPIC" echo "CI: $BUILD_VERSION $KERNEL_VERSION" + FSR="AGL/upload/ci/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER/$TARGETMACHINE" else # for release BUILD_VERSION="AGL-gerrit-$RELEASE_BRANCH-$RELEASE_VERSION" KERNEL_VERSION="$DIST_BB_DISTRO_VERSION" echo "RELEASE: $BUILD_VERSION $KERNEL_VERSION" + FSR="AGL/release/$RELEASE_BRANCH/$RELEASE_VERSION/$TARGETMACHINE" fi fi @@ -72,6 +76,7 @@ kci-publish() { --build_version $BUILD_VERSION \ --commit $DIST_BUILD_HASH \ --arch $TARGETARCH \ + --fsr $FSR \ --branch $GERRIT_BRANCH \ --kernel_version $KERNEL_VERSION \ --api http://kernelci.dev.baylibre.com:8081/ -- cgit 1.2.3-korg