diff options
3 files changed, 32 insertions, 113 deletions
diff --git a/jjb/release-jjb-chinook-release/include-release-jjb-chinook-release-move-sandbox.sh b/jjb/release-jjb-chinook-release/include-release-jjb-chinook-release-move-sandbox.sh new file mode 100644 index 00000000..536f726b --- /dev/null +++ b/jjb/release-jjb-chinook-release/include-release-jjb-chinook-release-move-sandbox.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +#set -x +set -e + +if test x"" = x"${RELEASE_BRANCH}"; then + echo "RELEASE_BRANCH invalid" + exit 1 +fi + +if test x"" = x"${RELEASE_VERSION}"; then + echo "RELEASE_VERSION invalid" + exit 1 +fi + + +export REMOTESRC="/src/download/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/" +export REMOTEDST="/srv/download/AGL/release/${RELEASE_BRANCH}/${RELEASE_VERSION}/" + +if test x"yes" = x"$UPLOAD" ; then + ssh -o StrictHostKeyChecking=no jenkins-slave@10.30.72.8 mkdir -p ${REMOTEDST} + ssh -o StrictHostKeyChecking=no jenkins-slave@10.30.72.8 mv ${REMOTESRC}/* ${REMOTEDST}/ + ssh -o StrictHostKeyChecking=no jenkins-slave@10.30.72.8 rm -r ${REMOTESRC} + ssh -o StrictHostKeyChecking=no jenkins-slave@10.30.72.8 sh -c "cd /srv/download/AGL/release/${RELEASE_BRANCH}/ ; rm latest ; ln -sf ${RELEASE_VERSION} latest ; echo ${RELEASE_VERSION} > latest.txt" || true +fi + +exit 0
\ No newline at end of file diff --git a/jjb/release-jjb-chinook-release/include-release-jjb-chinook-release-rsync.sh b/jjb/release-jjb-chinook-release/include-release-jjb-chinook-release-rsync.sh deleted file mode 100644 index 7b453a52..00000000 --- a/jjb/release-jjb-chinook-release/include-release-jjb-chinook-release-rsync.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash - -#set -x -set -e - -if test x"" = x"${RELEASE_BRANCH}"; then - echo "RELEASE_BRANCH invalid" - exit 1 -fi - -if test x"" = x"${RELEASE_VERSION}"; then - echo "RELEASE_VERSION invalid" - exit 1 -fi - -if test x"" = x"${MACHINE}"; then - echo "MACHINE invalid" - exit 1 -fi - -echo "#######################################" -echo "#######################################" -ls -alh -echo "#######################################" -echo "#######################################" -tree -L 2 -echo "#######################################" -echo "#######################################" -set | grep MACHINE -echo "#######################################" -echo "#######################################" -set -echo "#######################################" -echo "#######################################" - -cd repoclone/output - -export REMOTEDST="/srv/download/AGL/release/${RELEASE_BRANCH}/${RELEASE_VERSION}/" -export RSYNCDST="jenkins-slave@10.30.72.8:${REMOTEDST}" -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 - ssh -o StrictHostKeyChecking=no jenkins-slave@10.30.72.8 mkdir -p ${REMOTEDST} - rsync -avr -e "ssh -o StrictHostKeyChecking=no" $RSYNCSRC $RSYNCDST - ssh -o StrictHostKeyChecking=no jenkins-slave@10.30.72.8 sh -c "cd /srv/download/AGL/release/${RELEASE_BRANCH}/ ; rm latest ; ln -sf ${RELEASE_VERSION} latest ; echo ${RELEASE_VERSION} > latest.txt" || true -fi - -exit 0
\ No newline at end of file diff --git a/jjb/release-jjb-chinook-release/release-jjb-chinook-release.yaml b/jjb/release-jjb-chinook-release/release-jjb-chinook-release.yaml index 840a46cb..7473f5d4 100644 --- a/jjb/release-jjb-chinook-release/release-jjb-chinook-release.yaml +++ b/jjb/release-jjb-chinook-release/release-jjb-chinook-release.yaml @@ -1,11 +1,11 @@ - project: - name: release-jjb-chinook-release + name: release-jjb-chinook-release-from-snapshot jobs: - - release-jjb-chinook-release + - release-jjb-chinook-release-from-snapshot - job-template: - name: 'release-jjb-chinook-release' - project-type: matrix + name: 'release-jjb-chinook-release-from-snapshot' + project-type: freestyle concurrent: false node: control-slave @@ -34,21 +34,6 @@ name: UPLOAD default: yes_or_no description: "Upload?" - axes: - - axis: - type: user-defined - name: MACHINE - values: - - qemux86-64 - - porter-nogfx - - intel-corei7-64 - - raspberrypi3 - - dra7xx-evm - - axis: - type: slave - name: label - values: - - agl-test-slave build-discarder: days-to-keep: 30 @@ -56,11 +41,6 @@ artifact-days-to-keep: -1 artifact-num-to-keep: 5 - triggers: - - gerrit-trigger-patch-submitted-silent: - name: 'AGL/AGL-repo' - branch: 'refs/tags/chinook/**' - wrappers: - agl-infra-wrappers: build-timeout: '{build-timeout}' @@ -68,21 +48,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-fstypes.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-rsync.sh + - include-release-jjb-chinook-release-move-sandbox.sh |