From eaa5ad8a1cf18473b0ac5d6c5f299ae32ef72a48 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Wed, 8 Mar 2017 01:11:56 +0100 Subject: Handle creation of source tarballs via jjb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iaaccc07c92e4d72ca8df4528503834d9af8b8bbc Signed-off-by: Jan-Simon Möller --- ...de-release-jjb-chinook-release-sources-rsync.sh | 26 ++++------------------ .../release-jjb-chinook-sources.yaml | 2 +- 2 files changed, 5 insertions(+), 23 deletions(-) (limited to 'jjb/release-jjb-chinook-sources') 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 2958476b..9f763309 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 @@ -10,17 +10,9 @@ echo "#######################################" tree -L 2 echo "#######################################" echo "#######################################" -set | grep MACHINE -echo "#######################################" -echo "#######################################" -set -echo "#######################################" -echo "#######################################" - -cd repoclone/output -export RSYNCDST="jenkins-slave@10.30.72.8:/srv/download/AGL/release/${RELEASE_BRANCH}/${RELEASE_VERSION}/" -export RSYNCSRC=$(pwd)/UPLOAD/ +#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 @@ -28,22 +20,12 @@ rm -rf UPLOAD2 || true mkdir -p UPLOAD/${MACHINE} export DEST=$(pwd)/UPLOAD/${MACHINE} -# save space ... remove the rpms -rm -rf tmp/deploy/rpm || true - -rsync -avr --progress --delete tmp/deploy $DEST/ -rsync -avr --progress --delete tmp/log $DEST/ - -cp ../../current_default.xml $DEST/${MACHINE}_repo_default.xml -cp conf/local.conf $DEST/local.conf -cp conf/auto.conf $DEST/auto.conf -echo "$BUILD_URL" > $DEST/jenkins.build.url - tree $DEST ls -alhR $DEST -echo "would do rsync -avr -e \"ssh -o StrictHostKeyChecking=no\" $RSYNCSRC $RSYNCDST " + +exit 0 if test x"yes" = x"$UPLOAD" ; then rsync -avr -e "ssh -o StrictHostKeyChecking=no" $RSYNCSRC $RSYNCDST 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 284308e8..2e19c854 100644 --- a/jjb/release-jjb-chinook-sources/release-jjb-chinook-sources.yaml +++ b/jjb/release-jjb-chinook-sources/release-jjb-chinook-sources.yaml @@ -51,7 +51,7 @@ - ../common/include-agl-header.sh - ../common/include-agl-repo.sh - ../common/include-agl-select.sh - - ../common/include-agl-source-aglsetup.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 -- cgit 1.2.3-korg