Rework release job and build sdk

Change-Id: I60ee7883109d7227eb4e8d087b7128cd3e5a9095
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

11 files changed, 53 insertions, 10 deletions

diff --git a/jjb/ci-jjb-AGL/ci-jjb-AGL.yaml b/jjb/ci-jjb-AGL/ci-jjb-AGL.yaml
index 4473994a..f8187ffc 100644
--- a/jjb/ci-jjb-AGL/ci-jjb-AGL.yaml
+++ b/jjb/ci-jjb-AGL/ci-jjb-AGL.yaml
@@ -66,5 +66,7 @@
                 - ../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-bitbake-image.sh
                 - ../common/include-agl-test-nbd-short.sh
diff --git a/jjb/common/include-agl-auto-conf.sh b/jjb/common/include-agl-auto-conf.sh
index 8b0d9df7..33a9d390 100644
--- a/jjb/common/include-agl-auto-conf.sh
+++ b/jjb/common/include-agl-auto-conf.sh
@@ -20,7 +20,6 @@ file://.* file:///opt/AGL/sstate-mirror/\${MACHINE}/PATH    \n \
 file://.* ${DLHOST}/sstate-mirror/\${MACHINE}/PATH \n \
                  "
 
+IMAGE_FSTYPES_remove = "ext3"
 SSTATE_DIR = "\${TOPDIR}/sstate-cache/\${MACHINE}/"
 EOF
-
-#cat conf/auto.conf
diff --git a/jjb/common/include-agl-bitbake-image.sh b/jjb/common/include-agl-bitbake-image.sh
index 2196d8a7..73607cb5 100644
--- a/jjb/common/include-agl-bitbake-image.sh
+++ b/jjb/common/include-agl-bitbake-image.sh
@@ -6,6 +6,7 @@
 ################################################################################
 
 # finally, build the agl-demo-platform (we retry to catch the tar-native bug)
-bitbake $TARGETIMAGE || bitbake $TARGETIMAGE
+( ( bitbake $TARGETIMAGE ) || ( echo '## Failed once, retry ..  ##' ; sync ; sleep 2 ;  bitbake $TARGETIMAGE ) ) || ( echo '## Failed again, bail out ...' ; exit 1 ) 
+
 
 du -hs tmp/deploy/*
diff --git a/jjb/common/include-agl-bitbake-sdk.sh b/jjb/common/include-agl-bitbake-sdk.sh
index ee17ef08..b53a4125 100644
--- a/jjb/common/include-agl-bitbake-sdk.sh
+++ b/jjb/common/include-agl-bitbake-sdk.sh
@@ -6,6 +6,6 @@
 ################################################################################
 
 # finally, build the agl-demo-platform (we retry to catch the tar-native bug)
-bitbake -c $TARGETSDK $TARGETIMAGE || bitbake -c $TARGETSDK $TARGETIMAGE
+( ( bitbake -c $TARGETSDK $TARGETIMAGE ) || ( echo '## Failed once, retry ..  ##' ; sync ; sleep 2 ; bitbake -c $TARGETSDK $TARGETIMAGE ) ) || ( echo '## Failed again, bail out ... ##' ; exit 1 ) 
 
 du -hs tmp/deploy/*
diff --git a/jjb/common/include-agl-cat-auto-conf.sh b/jjb/common/include-agl-cat-auto-conf.sh
new file mode 100644
index 00000000..9a53f6d4
--- /dev/null
+++ b/jjb/common/include-agl-cat-auto-conf.sh
@@ -0,0 +1,3 @@
+echo "########## auto.conf ############"
+cat conf/auto.conf
+echo "########## auto.conf ############"
diff --git a/jjb/common/include-agl-limit-parallelism.sh b/jjb/common/include-agl-limit-parallelism.sh
new file mode 100644
index 00000000..67ae17df
--- /dev/null
+++ b/jjb/common/include-agl-limit-parallelism.sh
@@ -0,0 +1,3 @@
+BB_NUMBER_THREADS = "6"
+BB_NUMBER_PARSE_THREADS = "8"
+PARALLEL_MAKE = "-j6"
\ No newline at end of file
diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index 86900ea8..4e25be0f 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -9,5 +9,5 @@
     build-artifact-days-to-keep: -1
     build-artifact-num-to-keep: 10
     # Timeout in minutes
-    build-timeout: 360
+    build-timeout: 420
     ssh-credentials: 'agl-jobbuilder'
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 7728879b..d6e13946 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -265,7 +265,7 @@
     wrappers:
       - timeout:
           type: absolute
-          timeout: 360
+          timeout: 420
           fail: true
 
 - wrapper:
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