Rework for new image names and drop older releases.

Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I0323fd9053ed3679772715a0080a1990209a563a

4 files changed, 0 insertions, 261 deletions

diff --git a/jjb/release-jjb-marlin-snapshot/bitbake-html5-image-qemux86-64.sh b/jjb/release-jjb-marlin-snapshot/bitbake-html5-image-qemux86-64.sh
deleted file mode 100644
index 78af7470..00000000
--- a/jjb/release-jjb-marlin-snapshot/bitbake-html5-image-qemux86-64.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de
-# License GPLv2
-
-################################################################################
-## bitbake the sdk
-################################################################################
-#if ! test x"${GERRIT_BRANCH}" = x"dab" ; then
-#bitbake wic-tools
-#fi
-
-if test x"qemux86-64" = x"${TARGETMACHINE}" ; then
-
-# finally, build the agl-demo-platform (we retry to catch the tar-native bug)
-#( ( bitbake -c $TARGETSDK $TARGETIMAGE ) || ( echo '## Failed once, retry ..  ##' ; sync ; sleep 2 ; bitbake -c $TARGETSDK $TARGETIMAGE ) ) || ( echo '## Failed again, bail out ... ##' ; exit 1 ) 
-echo 'AGL_DEFAULT_IMAGE_FSTYPES_forcevariable = "wic.vmdk.xz wic.xz ext4.xz"' >> conf/local.conf
-echo 'AGL_EXTRA_IMAGE_FSTYPES_forcevariable = ""' >> conf/local.conf
-( ( bitbake agl-demo-platform-html5 ) || ( echo '## Failed once, retry ..  ##' ; sync ; sleep 2 ; bitbake agl-demo-platform-html5 ) ) || ( echo '## Failed again, bail out ... ##' ; exit 1 ) 
-
-du -hs tmp/deploy/*
-
-fi
\ No newline at end of file
diff --git a/jjb/release-jjb-marlin-snapshot/include-release-jjb-lamprey-snapshot-rsync.sh b/jjb/release-jjb-marlin-snapshot/include-release-jjb-lamprey-snapshot-rsync.sh
deleted file mode 100644
index 9be7c6f8..00000000
--- a/jjb/release-jjb-marlin-snapshot/include-release-jjb-lamprey-snapshot-rsync.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-#set -x
-set -e
-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/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/"
-export RSYNCDST="jenkins-slave@10.30.72.8:${REMOTEDST}"
-export RSYNCSRC=$(pwd)/UPLOAD/${MACHINE}
-
-# 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 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
-
-exit 0
\ No newline at end of file
diff --git a/jjb/release-jjb-marlin-snapshot/include-release-jjb-marlin-snapshot-rsync.sh b/jjb/release-jjb-marlin-snapshot/include-release-jjb-marlin-snapshot-rsync.sh
deleted file mode 100644
index 9be7c6f8..00000000
--- a/jjb/release-jjb-marlin-snapshot/include-release-jjb-marlin-snapshot-rsync.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-#set -x
-set -e
-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/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/"
-export RSYNCDST="jenkins-slave@10.30.72.8:${REMOTEDST}"
-export RSYNCSRC=$(pwd)/UPLOAD/${MACHINE}
-
-# 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 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
-
-exit 0
\ No newline at end of file
diff --git a/jjb/release-jjb-marlin-snapshot/release-jjb-marlin-snapshot.yaml b/jjb/release-jjb-marlin-snapshot/release-jjb-marlin-snapshot.yaml
deleted file mode 100644
index 833f2341..00000000
--- a/jjb/release-jjb-marlin-snapshot/release-jjb-marlin-snapshot.yaml
+++ /dev/null
@@ -1,126 +0,0 @@
----
-- project:
-    name: release-jjb-marlin-snapshot
-    jobs:
-      - release-jjb-marlin-snapshot
-
-- job-template:
-    name: 'release-jjb-marlin-snapshot'
-    project-type: matrix
-    concurrent: false
-    node: control-slave
-
-    parameters:
-      - string:
-          name: GERRIT_PROJECT
-          default: AGL/AGL-repo
-          description: "Project to build"
-      - string:
-          name: GERRIT_BRANCH
-          default: master
-          description: "branch to build"
-      - string:
-          name: GERRIT_REFSPEC
-          default: refs/tags/marlin_12.91.0
-          description: "refspec to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 12.91.0
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: marlin
-          description: "release branch to build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-      - string:
-          name: BUILDONLY
-          default: ignore
-          description: "build only specified machine"
-      - string:
-          name: DISABLE_SSTATE_MIRROR
-          default: ignore
-          description: "Set to YES to disable sstate-mirror"
-    axes:
-      - axis:
-          type: user-defined
-          name: MACHINE
-          values:
-            - qemux86-64
-            - qemuarm
-            - qemuarm64
-            - raspberrypi4
-            - m3ulcb-nogfx
-            - h3ulcb-nogfx
-            - bbe
-            # for aarch64
-      - axis:
-          type: slave
-          name: label
-          values:
-            - agl-test-slave
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    triggers:
-      - gerrit-trigger-patch-submitted-silent:
-          name: 'AGL/AGL-repo'
-          branch: 'regs/tags/marlin/**'
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-      - credentials-binding:
-          - username-password-separated:
-              credential-id: agl_main_lava_instance
-              username: AGLLAVAUSER
-              password: AGLLAVATOKEN
-          - username-password-separated:
-              credential-id: agl_main_lava_instance
-              username: LAB_AGL_USER
-              password: LAB_AGL_TOKEN
-          - username-password-separated:
-              credential-id: lab_baylibre_lava_instance
-              username: LAB_BAYLIBRE_USER
-              password: LAB_BAYLIBRE_TOKEN
-          - username-password-separated:
-              credential-id: lab_baylibre_seattle_lava_instance
-              username: LAB_BAYLIBRE_SEATTLE_USER
-              password: LAB_BAYLIBRE_SEATTLE_TOKEN
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - ../common/include-agl-header.sh
-          - ../common/include-agl-repo.sh
-          - ../common/include-agl-select.sh
-          - ../common/include-agl-export-eula.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-include-ptest.sh
-          - ../common/include-agl-local-conf-DISTROFEATURES-AGLCI.sh
-          - ../common/include-agl-local-conf-vmdk.sh
-          - ../common/include-agl-local-conf-rpi3-imagetype.sh
-          #- ../common/include-agl-bitbake-image.sh
-          - ../common/include-agl-bitbake-sdk.sh
-          - bitbake-html5-image-qemux86-64.sh
-      - shell:
-          !include-raw-escape: include-release-jjb-marlin-snapshot-rsync.sh
-      - shell:
-          !include-raw-escape:
-          - ../common/include-agl-header.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-marlin.sh
-          - ../common/include-agl-lava-jobs-submit-only.sh