diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2017-01-05 21:58:07 +0100 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2017-01-05 21:58:07 +0100 |
| commit | bc3be24607f3b34cdbb6c7b07e20f28acffc0a67 (patch) | |
| tree | 8669d14307ebd88205d9087a518b97c7fc11e1dd /jjb/release-jjb-chinook-snapshot | |
| parent | 32e2a957b0e53ebbef3642e17d54d26642452b3d (diff) | |
Rework release job and build sdk
Change-Id: I60ee7883109d7227eb4e8d087b7128cd3e5a9095
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'jjb/release-jjb-chinook-snapshot')
3 files changed, 39 insertions, 4 deletions
diff --git a/jjb/release-jjb-chinook-snapshot/include-release-jjb-chinook-snapshot-build.sh b/jjb/release-jjb-chinook-snapshot/include-release-jjb-chinook-snapshot-build.sh deleted file mode 120000 index 2f40c060..00000000 --- a/jjb/release-jjb-chinook-snapshot/include-release-jjb-chinook-snapshot-build.sh +++ /dev/null @@ -1 +0,0 @@ -../common/include-agl-build.sh
\ No newline at end of file diff --git a/jjb/release-jjb-chinook-snapshot/include-release-jjb-chinook-snapshot-rsync.sh b/jjb/release-jjb-chinook-snapshot/include-release-jjb-chinook-snapshot-rsync.sh index c76d319c..4d5da74f 100644 --- a/jjb/release-jjb-chinook-snapshot/include-release-jjb-chinook-snapshot-rsync.sh +++ b/jjb/release-jjb-chinook-snapshot/include-release-jjb-chinook-snapshot-rsync.sh @@ -17,13 +17,36 @@ set echo "#######################################" echo "#######################################" -export RSYNCSRC="$(pwd)/tmp/deploy/images/" +cd repoclone/output + 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} + +# 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 " if test x"yes" = x"$UPLOAD" ; then -echo upload + rsync -avr --delete -e "ssh -o StrictHostKeyChecking=no" $RSYNCSRC $RSYNCDST fi exit 0
\ No newline at end of file diff --git a/jjb/release-jjb-chinook-snapshot/release-jjb-chinook-snapshot.yaml b/jjb/release-jjb-chinook-snapshot/release-jjb-chinook-snapshot.yaml index 39566055..570f1b13 100644 --- a/jjb/release-jjb-chinook-snapshot/release-jjb-chinook-snapshot.yaml +++ b/jjb/release-jjb-chinook-snapshot/release-jjb-chinook-snapshot.yaml @@ -67,7 +67,20 @@ builders: - shell: - !include-raw-escape: include-release-jjb-chinook-snapshot-build.sh + !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-snapshot-rsync.sh |