diff options
| -rw-r--r-- | jjb/ci-apps-verify/ci-apps-jjb.yaml | 8 | ||||
| -rw-r--r-- | jjb/ci-management/ci-management.yaml | 4 | ||||
| -rw-r--r-- | jjb/release-jjb-flounder-sources/include-release-jjb-release-sources-rsync.sh | 9 | ||||
| -rw-r--r-- | packer/provision/agl_dependencies.sh | 2 |
4 files changed, 15 insertions, 8 deletions
diff --git a/jjb/ci-apps-verify/ci-apps-jjb.yaml b/jjb/ci-apps-verify/ci-apps-jjb.yaml index 2f88699a..72433f63 100644 --- a/jjb/ci-apps-verify/ci-apps-jjb.yaml +++ b/jjb/ci-apps-verify/ci-apps-jjb.yaml @@ -3,6 +3,7 @@ name: ci-apps-AGL aglbranch: - master + - flounder - eel - dab architecture: @@ -28,7 +29,9 @@ - agl-service-gps - agl-service-gstreamer - agl-service-harvester + - agl-service-homescreen - agl-service-homescreen-2017 + - agl-service-hvac - agl-service-identity-agent - agl-service-iiodevices - agl-service-mediaplayer @@ -40,8 +43,10 @@ - agl-service-signal-composer - agl-service-soundmanager - agl-service-soundmanager-2017 + - agl-service-speech - agl-service-steering-wheel - agl-service-taskmanager + - agl-service-telephony - agl-service-unicens - agl-service-weather - agl-service-wifi @@ -49,7 +54,6 @@ - agl-service-windowmanager-2017 - agl-service-xds-monitoring - als-meter-demo - - app-afb-test - controls - dashboard - homescreen @@ -588,7 +592,7 @@ - ../common/include-apps-fetch-install-sdk.sh - ../common/include-apps-build-app.sh - ../common/include-apps-prepare-upload-folder-merged.sh - - ../common/include-apps-rsync-download-apprepo.sh + #- ../common/include-apps-rsync-download-apprepo.sh publishers: - naginator: diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml index 75ab030f..9189b8e8 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -22,7 +22,7 @@ name: ci-management-verify-jjb project-type: freestyle - node: master + node: agl-test-slave concurrent: true parameters: @@ -56,7 +56,7 @@ name: 'ci-management-merge' project-type: freestyle - node: master + node: agl-test-slave build-discarder: days-to-keep: 30 diff --git a/jjb/release-jjb-flounder-sources/include-release-jjb-release-sources-rsync.sh b/jjb/release-jjb-flounder-sources/include-release-jjb-release-sources-rsync.sh index c52387cf..e458a17d 100644 --- a/jjb/release-jjb-flounder-sources/include-release-jjb-release-sources-rsync.sh +++ b/jjb/release-jjb-flounder-sources/include-release-jjb-release-sources-rsync.sh @@ -28,9 +28,12 @@ mkdir -p ../UPLOAD/ cp -ar agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.* ../UPLOAD/ export RSYNCSRC=$(pwd)/../UPLOAD -export RSYNCDST="jenkins-slave@10.30.72.8:/srv/download/AGL/release/${RELEASE_BRANCH}/" +export RSYNCDST="/srv/download/AGL/release/${RELEASE_BRANCH}/" if test x"yes" = x"${UPLOAD}" ; then + set +x ssh -o StrictHostKeyChecking=no jenkins-slave@10.30.72.8 "mkdir -p ${RSYNCDST}" - rsync -avr -e "ssh -o StrictHostKeyChecking=no" ${RSYNCSRC}/* ${RSYNCDST} -fi + rsync -avr -e "ssh -o StrictHostKeyChecking=no" ${RSYNCSRC}/* jenkins-slave@10.30.72.8:${RSYNCDST} + ssh -o StrictHostKeyChecking=no jenkins-slave@10.30.72.8 "rm -rf ${RSYNCDST}/latest" + ssh -o StrictHostKeyChecking=no jenkins-slave@10.30.72.8 "ln -sf ${RELEASE_VERSION} ${RSYNCDST}/latest" +fi
\ No newline at end of file diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh index 7db6455d..1f06224e 100644 --- a/packer/provision/agl_dependencies.sh +++ b/packer/provision/agl_dependencies.sh @@ -46,7 +46,7 @@ cat <<EOFHOSTS >> /etc/hosts EOFHOSTS # install newer version of jjb ... fixes issues with rendering -sudo pip install --upgrade --force-reinstall -v jenkins-job-builder +sudo pip install --upgrade --force-reinstall -v jenkins-job-builder==1.6.1 cat <<EOFSYSCTL >> /etc/sysctl.conf # we have a lot of make jobs, this helps a lot |