From 46ab1c539d3c07d23b5995b0e6d30191ac6913ad Mon Sep 17 00:00:00 2001
From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Thu, 9 Mar 2017 00:04:27 +0100
Subject: Pull signed and release-ready source tarballs from git and upload
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I79097ed1296b42ace14f1f7f5b9a626dd8ef8bd3
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 ...de-release-jjb-chinook-release-sources-rsync.sh | 41 +++++++++++-----------
 .../release-jjb-chinook-sources.yaml               | 29 +--------------
 2 files changed, 22 insertions(+), 48 deletions(-)

(limited to 'jjb')

diff --git a/jjb/release-jjb-chinook-sources/include-release-jjb-chinook-release-sources-rsync.sh b/jjb/release-jjb-chinook-sources/include-release-jjb-chinook-release-sources-rsync.sh
index 9f763309..cf08038d 100644
--- a/jjb/release-jjb-chinook-sources/include-release-jjb-chinook-release-sources-rsync.sh
+++ b/jjb/release-jjb-chinook-sources/include-release-jjb-chinook-release-sources-rsync.sh
@@ -2,33 +2,34 @@
 
 #set -x
 set -e
-echo "#######################################"
-echo "#######################################"
-ls -alh
-echo "#######################################"
-echo "#######################################"
-tree -L 2
-echo "#######################################"
-echo "#######################################"
-
 #export RSYNCDST="jenkins-slave@10.30.72.8:/srv/download/AGL/release/${RELEASE_BRANCH}/${RELEASE_VERSION}/"
 #export RSYNCSRC=$(pwd)/UPLOAD/
 
 # construct upload folder
-mv UPLOAD UPLOAD2 || true
-rm -rf UPLOAD2 || true
-mkdir -p UPLOAD/${MACHINE}
-export DEST=$(pwd)/UPLOAD/${MACHINE}
 
-tree $DEST
 
-ls -alhR $DEST
+BRANCH=${RELEASE_BRANCH}
+RELVER=${RELEASE_VERSION}
 
+rm -rf release-upload || true
 
-exit 0
+git clone -b ${RELEASE_BRANCH} ssh://jsmoeller@gerrit.automotivelinux.org:29418/staging/release-upload
+cd release-upload
 
-if test x"yes" = x"$UPLOAD" ; then
-   rsync -avr -e "ssh -o StrictHostKeyChecking=no" $RSYNCSRC $RSYNCDST
-fi
+gpg --keyserver pgp.mit.edu --recv D6DD2170
+
+ls | grep -q agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.tar.bz2
+
+( gpg --verify agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.tar.bz2.sig agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.tar.bz2 2>&1 | grep -e "Good signature.*Jan-Simon.*Moeller.*AGL.*Release" -q && echo "gpg key verification succeeded" ) || ( echo "gpg key verification failed" && exit 1 )
 
-exit 0
\ No newline at end of file
+rm -rf ../UPLOAD || true
+mkdir -p ../UPLOAD/
+
+cp -ar agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.* ../UPLOAD/
+
+export RSYNCSRC=$(pwd)/../UPLOAD
+export RSYNCDST="jenkins-slave@10.30.72.8:/srv/download/AGL/release/${RELEASE_BRANCH}/"
+
+if test x"yes" = x"${UPLOAD}" ; then
+   rsync -avr -e "ssh -o StrictHostKeyChecking=no" ${RSYNCSRC}/* ${RSYNCDST}
+fi
diff --git a/jjb/release-jjb-chinook-sources/release-jjb-chinook-sources.yaml b/jjb/release-jjb-chinook-sources/release-jjb-chinook-sources.yaml
index 2e19c854..f9c5353c 100644
--- a/jjb/release-jjb-chinook-sources/release-jjb-chinook-sources.yaml
+++ b/jjb/release-jjb-chinook-sources/release-jjb-chinook-sources.yaml
@@ -10,18 +10,6 @@
     node: agl-test-slave
 
     parameters:
-      - string:
-          name: GERRIT_PROJECT
-          default: AGL/AGL-repo
-          description: "Project to build"
-      - string:
-          name: GERRIT_BRANCH
-          default: chinook
-          description: "branch to build"
-      - string:
-          name: GERRIT_REFSPEC
-          default: refs/tags/3.0.2
-          description: "refspec to build"
       - string:
           name: RELEASE_VERSION
           default: 3.0.2
@@ -48,20 +36,5 @@
     builders:
       - shell:
             !include-raw-escape:
-                - ../common/include-agl-header.sh
-                - ../common/include-agl-repo.sh
-                - ../common/include-agl-select.sh
-#                - ../common/include-agl-source-aglsetup.sh
-#                - ../common/include-agl-auto-conf.sh
-#                - ../common/include-agl-limit-parallelism.sh
-#                - ../common/include-agl-cat-auto-conf.sh
-#                - ../common/include-agl-local-conf-archiver.sh
-#                - ../common/include-agl-local-conf-isafw.sh
-#                - ../common/include-agl-local-conf-vmdk.sh
-#                - ../common/include-agl-bitbake-image.sh
-#                - ../common/include-agl-bitbake-sdk.sh
-#                - ../common/include-agl-test-nbd-short.sh
-#      - shell:
-#            !include-raw-escape:
-#                 - include-release-jjb-chinook-release-sources-rsync.sh
+                 - include-release-jjb-chinook-release-sources-rsync.sh
 
-- 
cgit 1.2.3-korg