diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2018-01-06 19:47:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2018-01-06 19:47:14 +0000 |
| commit | f7ed9d82101fd3428cfa61d60007f722d19af271 (patch) | |
| tree | df309b99d2a989c245f0b9b19ff3090d0fe609dd | |
| parent | 06b4550b3fb1c13827cdbbc2b58d42e5ec6d259a (diff) | |
| parent | 889c069180615cbbcb5f9de1e793b59ab54394b5 (diff) | |
Merge "Streamline image output and add new board"
3 files changed, 11 insertions, 10 deletions
diff --git a/jjb/common/include-agl-run-test-rsync-release.sh b/jjb/common/include-agl-run-test-rsync-release.sh index 85605494..abab0f34 100644 --- a/jjb/common/include-agl-run-test-rsync-release.sh +++ b/jjb/common/include-agl-run-test-rsync-release.sh @@ -22,8 +22,8 @@ cd $REPODIR cd output -pwd -ls -alhR tmp/deploy/images +#pwd +#ls -alhR tmp/deploy/images # copy files to $DEST for i in DEVICE_DTB DEVICE_KERNEL DEVICE_INITRAMFS DEVICE_NBDROOT; do diff --git a/jjb/release-jjb-eel-snapshot/include-release-jjb-eel-snapshot-rsync.sh b/jjb/release-jjb-eel-snapshot/include-release-jjb-eel-snapshot-rsync.sh index 3ffeb244..9be7c6f8 100644 --- a/jjb/release-jjb-eel-snapshot/include-release-jjb-eel-snapshot-rsync.sh +++ b/jjb/release-jjb-eel-snapshot/include-release-jjb-eel-snapshot-rsync.sh @@ -49,6 +49,7 @@ ls -alhR $DEST echo "would do rsync -avr -e \"ssh -o StrictHostKeyChecking=no\" $RSYNCSRC $RSYNCDST " if test x"yes" = x"$UPLOAD" ; then + ssh -o StrictHostKeyChecking=no jenkins-slave@10.30.72.8 rm -rf ${REMOTEDST} ssh -o StrictHostKeyChecking=no jenkins-slave@10.30.72.8 mkdir -p ${REMOTEDST} rsync --delete -avr -e "ssh -o StrictHostKeyChecking=no" $RSYNCSRC/* $RSYNCDST fi diff --git a/jjb/release-jjb-eel-snapshot/release-jjb-eel-snapshot.yaml b/jjb/release-jjb-eel-snapshot/release-jjb-eel-snapshot.yaml index 1bdcb182..2757c5e3 100644 --- a/jjb/release-jjb-eel-snapshot/release-jjb-eel-snapshot.yaml +++ b/jjb/release-jjb-eel-snapshot/release-jjb-eel-snapshot.yaml @@ -21,11 +21,11 @@ description: "branch to build" - string: name: GERRIT_REFSPEC - default: refs/tags/eel_4.99.1 + default: refs/tags/eel_5.0.0 description: "refspec to build" - string: name: RELEASE_VERSION - default: 4.99.1 + default: 5.0.0 description: "release version number for build" - string: name: RELEASE_BRANCH @@ -41,7 +41,7 @@ name: MACHINE values: - qemux86-64 - - porter-nogfx + - cyclone5 - intel-corei7-64 - raspberrypi3 - dra7xx-evm @@ -103,11 +103,11 @@ - ../common/include-agl-local-conf-vmdk.sh - ../common/include-agl-local-conf-rpi3-imagetype.sh - include-release-eel-fix-task-depends.sh - - ../common/include-agl-bitbake-image.sh + #- ../common/include-agl-bitbake-image.sh - ../common/include-agl-bitbake-sdk.sh - - ../common/include-agl-run-test-prepare.sh - - ../common/include-agl-run-test-rsync-release.sh - - ../common/include-agl-lava-labs-prepare.sh - - ../common/include-agl-run-test-short-release.sh + #- ../common/include-agl-run-test-prepare.sh + #- ../common/include-agl-run-test-rsync-release.sh + #- ../common/include-agl-lava-labs-prepare.sh + #- ../common/include-agl-run-test-short-release.sh - shell: !include-raw-escape: include-release-jjb-eel-snapshot-rsync.sh |