diff options
author | 2017-09-18 00:52:47 +0200 | |
---|---|---|
committer | 2017-09-18 01:47:46 +0200 | |
commit | c03de42226fa655cca3db103b3cdc291b829f405 (patch) | |
tree | ebfd686773edb7640818acf694b065b64b7e1732 /jjb | |
parent | 72525273dc11c1d61a7091cb1cdad171a2e321c3 (diff) |
Update application CI job and extend local test script
Change-Id: I0f6609aeddc4b9b2d335921d980db6f4978b2cb6
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'jjb')
-rwxr-xr-x | jjb/ci-apps-verify/ci-apps-jjb.local.sh | 24 | ||||
-rw-r--r-- | jjb/ci-apps-verify/ci-apps-jjb.yaml | 1 | ||||
-rw-r--r-- | jjb/common/include-apps-prepare-upload-folder.sh | 36 | ||||
-rw-r--r-- | jjb/common/include-apps-rsync-download-changeid.sh | 27 |
4 files changed, 46 insertions, 42 deletions
diff --git a/jjb/ci-apps-verify/ci-apps-jjb.local.sh b/jjb/ci-apps-verify/ci-apps-jjb.local.sh index 0e7c3b51..3248c729 100755 --- a/jjb/ci-apps-verify/ci-apps-jjb.local.sh +++ b/jjb/ci-apps-verify/ci-apps-jjb.local.sh @@ -1,12 +1,12 @@ #!/bin/bash #set -x - +export AGLBRANCH=master export GERRIT_REFSPEC="refs/changes/51/9551/2" export GERRIT_PROJECT="apps/mediaplayer" -export GERRIT_CHANGE_NUMBER="9551" -export GERRIT_PATCHSET_NUMBER="2" -export GERRIT_PATCHSET_REVISION="f3ddc376291262a6b305cc2b0a52792abdc7c85c" +export GERRIT_CHANGE_NUMBER="10799" +export GERRIT_PATCHSET_NUMBER="1" +export GERRIT_PATCHSET_REVISION="1a1ff962da92aff5a1d3e757710c725e03238458" export GERRIT_HOST="gerrit.automotivelinux.org" export GERRIT_PORT="29418" @@ -22,23 +22,17 @@ done source env.save -#set -x -#export GERRIT_REFSPEC=\"$GERRIT_REFSPEC\" -#export GERRIT_PROJECT=\"$GERRIT_PROJECT\" -#export GERRIT_CHANGE_NUMBER=\"$GERRIT_CHANGE_NUMBER\" -#export GERRIT_PATCHSET_NUMBER=\"$GERRIT_PATCHSET_NUMBER\" -#export GERRIT_PATCHSET_REVISION=\"$GERRIT_PATCHSET_REVISION\" -#export GERRIT_HOST=\"$GERRIT_HOST\" -#export GERRIT_PORT=\"$GERRIT_PORT\" rm -rf ~/agl-sdk || true . ../common/include-apps-header.sh . ../common/include-apps-fetch-install-sdk.sh . ../common/include-apps-build-app.sh -. ../common/include-apps-rsync-download-changeid.sh - -#" +. ../common/include-apps-prepare-upload-folder.sh +# do not really upload +#. ../common/include-apps-rsync-download-changeid.sh popd +ls -R UPLOAD + done
\ No newline at end of file diff --git a/jjb/ci-apps-verify/ci-apps-jjb.yaml b/jjb/ci-apps-verify/ci-apps-jjb.yaml index 56b8ee5b..c31eb765 100644 --- a/jjb/ci-apps-verify/ci-apps-jjb.yaml +++ b/jjb/ci-apps-verify/ci-apps-jjb.yaml @@ -208,6 +208,7 @@ - ../common/include-apps-header.sh - ../common/include-apps-fetch-install-sdk.sh - ../common/include-apps-build-app.sh + - ../common/include-apps-prepare-upload-folder.sh - ../common/include-apps-rsync-download-changeid.sh publishers: diff --git a/jjb/common/include-apps-prepare-upload-folder.sh b/jjb/common/include-apps-prepare-upload-folder.sh new file mode 100644 index 00000000..e883e610 --- /dev/null +++ b/jjb/common/include-apps-prepare-upload-folder.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +#set -x +set -e + +echo -e "\n\n\n" +echo "#########################################" +echo -e "\n\n\n" + + + +# construct upload folder +#mv UPLOAD UPLOAD2 || true +if test x"" = x"${AGLBRANCH}" ; then + rm -rf UPLOAD/${TARGETARCH} || true + mkdir -p UPLOAD/${TARGETARCH} + export DEST=$(pwd)/UPLOAD/${TARGETARCH} +else + rm -rf UPLOAD/${AGLBRANCH}/${TARGETARCH} || true + mkdir -p UPLOAD/${AGLBRANCH}/${TARGETARCH} + export DEST=$(pwd)/UPLOAD/${AGLBRANCH}/${TARGETARCH} +fi + +pushd ${MYPROJECT} +pwd + +ls -alh + +ls + +ls package || true + +cp package/*.wgt $DEST +ls -alh $DEST + +popd diff --git a/jjb/common/include-apps-rsync-download-changeid.sh b/jjb/common/include-apps-rsync-download-changeid.sh index 8a9129a1..1f5e10b9 100644 --- a/jjb/common/include-apps-rsync-download-changeid.sh +++ b/jjb/common/include-apps-rsync-download-changeid.sh @@ -7,35 +7,8 @@ echo -e "\n\n\n" echo "#########################################" echo -e "\n\n\n" - export RSYNCDST="/srv/download/AGL/upload/ci/${GERRIT_CHANGE_NUMBER}/${GERRIT_PATCHSET_NUMBER}" export RSYNCSRC=$(pwd)/UPLOAD/ - -# construct upload folder -#mv UPLOAD UPLOAD2 || true -if test x"" = x"${AGLBRANCH}" ; then - rm -rf UPLOAD/${TARGETARCH} || true - mkdir -p UPLOAD/${TARGETARCH} - export DEST=$(pwd)/UPLOAD/${TARGETARCH} -else - rm -rf UPLOAD/${AGLBRANCH}/${TARGETARCH} || true - mkdir -p UPLOAD/${AGLBRANCH}/${TARGETARCH} - export DEST=$(pwd)/UPLOAD/${AGLBRANCH}/${TARGETARCH} -fi - -pushd ${MYPROJECT} -pwd - -ls -alh - -ls - -ls package || true - -cp package/*.wgt $DEST -ls -alh $DEST LANG=C tree $RSYNCSRC - -popd ssh -o StrictHostKeyChecking=no jenkins-slave@10.30.72.8 mkdir -p ${RSYNCDST} rsync -avr -L -e "ssh -o StrictHostKeyChecking=no" $RSYNCSRC jenkins-slave@10.30.72.8:$RSYNCDST |