Rework for new image names and drop older releases.

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

129 files changed, 36 insertions, 6131 deletions

diff --git a/jjb/ci-apps-verify/.gitignore b/OLD/ci-apps-verify/.gitignore
index 748bbba1..748bbba1 100644
--- a/jjb/ci-apps-verify/.gitignore
+++ b/OLD/ci-apps-verify/.gitignore
diff --git a/jjb/ci-apps-verify/app-projects.yaml.inc b/OLD/ci-apps-verify/app-projects.yaml.inc
index 84ecae07..84ecae07 100644
--- a/jjb/ci-apps-verify/app-projects.yaml.inc
+++ b/OLD/ci-apps-verify/app-projects.yaml.inc
diff --git a/jjb/ci-apps-verify/ci-apps-jjb.local.sh b/OLD/ci-apps-verify/ci-apps-jjb.local.sh
index 404ce61e..404ce61e 100755
--- a/jjb/ci-apps-verify/ci-apps-jjb.local.sh
+++ b/OLD/ci-apps-verify/ci-apps-jjb.local.sh
diff --git a/jjb/ci-apps-verify/ci-apps-jjb.yaml b/OLD/ci-apps-verify/ci-apps-jjb.yaml
index 17a0b5da..863ca701 100644
--- a/jjb/ci-apps-verify/ci-apps-jjb.yaml
+++ b/OLD/ci-apps-verify/ci-apps-jjb.yaml
@@ -2,11 +2,7 @@
 - project:
     name: ci-apps-AGL
     aglbranch:
-      #- master
-      - icefish
-      - jellyfish
-      - koi
-      - lamprey
+      - master
     architecture:
       - aarch64
       - x86-64
@@ -743,10 +739,10 @@
           - ../common/include-agl-header.sh
           - ../common/include-agl-repo.sh
           #- ../common/include-agl-select.sh
-          - ../common/include-agl-run-test-prepare.sh
-          - ../common/include-agl-lava-labs-prepare.sh
-          - ../common/include-agl-app-run-test-short.sh
-          - ../common/include-agl-lava-jobs-submit.sh
+          #- ../common/include-agl-run-test-prepare.sh
+          #- ../common/include-agl-lava-labs-prepare.sh
+          #- ../common/include-agl-app-run-test-short.sh
+          #- ../common/include-agl-lava-jobs-submit.sh
       - conditional-step:
           condition-kind: always
           steps:
diff --git a/jjb/ci-apps-verify/update-app-projects-yaml.sh b/OLD/ci-apps-verify/update-app-projects-yaml.sh
index 8a645b9c..8a645b9c 100755
--- a/jjb/ci-apps-verify/update-app-projects-yaml.sh
+++ b/OLD/ci-apps-verify/update-app-projects-yaml.sh
diff --git a/jjb/test-lava/test-lava.yaml b/OLD/test-lava/test-lava.yaml
index 31935843..31935843 100644
--- a/jjb/test-lava/test-lava.yaml
+++ b/OLD/test-lava/test-lava.yaml
diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
index bc1f2f66..2ef36c1b 100644
--- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml
+++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
@@ -21,14 +21,13 @@
       - meta-agl
       - meta-agl-demo
       - meta-agl-devel
-      - meta-agl-extra
       - AGL-repo
     jobs:
       - ci-platform-{project}-verify
       # - ci-platform-{project}-verify-CIB-start             #unused
       - ci-platform-{project}-verify-CIB-{machine}
       - ci-platform-{project}-verify-YCL-qemux86-64
-      #- ci-platform-{project}-verify-CIB-html5-qemux86-64
+      - ci-platform-{project}-verify-CIB-html5-qemux86-64
       - ci-platform-{project}-verify-CIB-flutter-qemux86-64
       #- ci-platform-{project}-verify-CIB-ic-multicontainer-qemux86-64
       - ci-platform-{project}-verify-CIB-finish-success
diff --git a/jjb/ci-xds-verify/ci-xds-jjb.yaml b/jjb/ci-xds-verify/ci-xds-jjb.yaml
deleted file mode 100644
index 7cebdfae..00000000
--- a/jjb/ci-xds-verify/ci-xds-jjb.yaml
+++ /dev/null
@@ -1,470 +0,0 @@
----
-- project:
-    name: ci-xds-AGL
-    aglbranch:
-      - master
-    project:
-      - xds-server
-      - xds-agent
-      - xds-gdb
-      - xds-cli
-    jobs:
-      - ci-xds-{project}-verify-{aglbranch}
-      - ci-xds-{project}-verify-{aglbranch}-CIB
-      - ci-xds-{project}-verify-{aglbranch}-CIB-finish-success
-      - ci-xds-{project}-remove-artifacts
-      - ci-xds-{project}-merge
-      - ci-xds-{project}-merge-finish-success
-
-
-################################################################################################################################################################
-################################################################################################################################################################
-
-################# VERIFY #################
-
-################################################################################
-# ci-xds-{project}-verify  =  trigger from gerrit and control job
-################################################################################
-- job-template:
-    name: 'ci-xds-{project}-verify-{aglbranch}'
-    project-type: multijob
-    concurrent: true
-    node: control-slave
-    parameters:
-      - string:
-          name: GERRIT_PROJECT
-          default: 'src/xds/{project}'
-          description: "Project to build"
-      - string:
-          name: GERRIT_BRANCH
-          default: '{aglbranch}'
-          description: "branch to build"
-      - string:
-          name: GERRIT_REFSPEC
-          default: 'refs/heads/{aglbranch}'
-          description: "refspec to build"
-      - string:
-          name: GERRIT_CHANGE_NUMBER
-          default: "8313"
-          description: "change # to build"
-      - string:
-          name: GERRIT_PATCHSET_NUMBER
-          default: "2"
-          description: "patchset # to build"
-      - string:
-          name: AGLBRANCH
-          default: '{aglbranch}'
-          description: "AGL release branch to use"
-    build-discarder:
-      days-to-keep: 30
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-    triggers:
-      - gerrit-trigger-patch-submitted-manual-verified:
-          name: 'src/xds/{project}'
-          branch: '{aglbranch}'
-          silent: 'true'
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-    builders:
-      - shell: |
-          set
-          export TRIGGERURL=$(echo ${{BUILD_URL}} | sed -e 's,-CIB-start.*,,')
-          echo \$TRIGGERURL
-          ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified=0 -n NONE --message="CI-cycle\ started.\ URL:\ ${{BUILD_URL}}" || true
-      - multijob:
-          name: CIB-{project}
-          condition: SUCCESSFUL
-          projects:
-            - name: 'ci-xds-{project}-verify-{aglbranch}-CIB'
-              current-parameters: true
-              #abort-all-job: true
-              kill-phase-on: FAILURE
-              predefined-parameters: AGLBRANCH={aglbranch}
-      - multijob:
-          name: CIB-finish-success
-          condition: SUCCESSFUL
-          projects:
-            - name: 'ci-xds-{project}-verify-{aglbranch}-CIB-finish-success'
-              current-parameters: true
-              abort-all-job: true
-              kill-phase-on: FAILURE
-
-
-
-#      - ci-xds-{project}-verify-{aglbranch}-CIB
-################################################################################
-################################################################################
-- job-template:
-    name: 'ci-xds-{project}-verify-{aglbranch}-CIB'
-    project-type: freestyle
-    concurrent: true
-    node: agl-test-slave
-    parameters:
-      - string:
-          name: GERRIT_PROJECT
-          default: 'src/xds/{project}'
-          description: "Project to build"
-      - string:
-          name: GERRIT_BRANCH
-          default: '{aglbranch}'
-          description: "branch to build"
-      - string:
-          name: GERRIT_REFSPEC
-          default: refs/heads/{aglbranch}
-          description: "refspec to build"
-      - string:
-          name: GERRIT_CHANGE_NUMBER
-          default: ""
-          description: "change # to build"
-      - string:
-          name: GERRIT_PATCHSET_NUMBER
-          default: ""
-          description: "patchset # to build"
-      - string:
-          name: AGLBRANCH
-          default: '{aglbranch}'
-          description: "AGL release branch to use"
-      - string:
-          name: PROJECT_TO_BUILD
-          default: '{project}'
-          description: 'plain project name'
-    build-discarder:
-      days-to-keep: 30
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-      - openstack:
-          single-use: true
-
-    builders:
-      - shell:
-          # including from ../common
-          !include-raw-escape:
-          - ../common/include-xds-header.sh
-          - ../common/include-xds-build-common.sh
-          - ../common/include-xds-prepare-upload-folder.sh
-          - ../common/include-xds-rsync-download-changeid.sh
-
-    publishers:
-      - naginator:
-          rerun-unstable-builds: true
-          progressive-delay-increment: 5
-          progressive-delay-maximum: 15
-          max-failed-builds: 2
-          #regular-expression: "Unexpected termination of the channel"
-
-
-#      - ci-xds-{project}-verify-{aglbranch}-CIB-finish-success
-################################################################################
-################################################################################
-- job-template:
-    name: 'ci-xds-{project}-verify-{aglbranch}-CIB-finish-success'
-    project-type: freestyle
-    concurrent: true
-    node: control-slave
-    parameters:
-      - string:
-          name: GERRIT_PROJECT
-          default: 'src/xds/{project}'
-          description: "Project to build"
-      - string:
-          name: GERRIT_BRANCH
-          default: '{aglbranch}'
-          description: "branch to build"
-      - string:
-          name: GERRIT_REFSPEC
-          default: 'refs/heads/{aglbranch}'
-          description: "refspec to build"
-      - string:
-          name: GERRIT_CHANGE_NUMBER
-          default: "8313"
-          description: "change # to build"
-      - string:
-          name: GERRIT_PATCHSET_NUMBER
-          default: "2"
-          description: "patchset # to build"
-      - string:
-          name: AGLBRANCH
-          default: '{aglbranch}'
-          description: "AGL release branch to use"
-    build-discarder:
-      days-to-keep: 30
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-    builders:
-      - shell: |
-          set
-          echo "#### CIB +1 #### Verified +1 ####"
-          ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-image-build=+1 -n NONE --message="CI-Image-Build\ finished,\ CIB+1,\ Verified+1.\ Artifacts\ available\ at\ https://download.automotivelinux.org/AGL/upload/ci/${{GERRIT_CHANGE_NUMBER}}/${{GERRIT_PATCHSET_NUMBER}}/\ ." || true
-
-
-#      - ci-xds-{project}-verify-{aglbranch}-failure
-################################################################################
-################################################################################
-
-#      - ci-xds-{project}-merge
-################################################################################
-################################################################################
-- job-template:
-    name: 'ci-xds-{project}-merge'
-    project-type: multijob
-    concurrent: true
-    node: control-slave
-    parameters:
-      - string:
-          name: GERRIT_PROJECT
-          default: 'src/xds/{project}'
-          description: "Project to build"
-      - string:
-          name: GERRIT_BRANCH
-          default: '{aglbranch}'
-          description: "branch to build"
-      - string:
-          name: GERRIT_REFSPEC
-          default: 'refs/heads/{aglbranch}'
-          description: "refspec to build"
-      - string:
-          name: GERRIT_CHANGE_NUMBER
-          default: "8313"
-          description: "change # to build"
-      - string:
-          name: GERRIT_PATCHSET_NUMBER
-          default: "2"
-          description: "patchset # to build"
-      - string:
-          name: AGLBRANCH
-          default: '{aglbranch}'
-          description: "AGL release branch to use"
-      - string:
-          name: PROJECT_TO_BUILD
-          default: '{project}'
-          description: 'plain project name to build'
-    build-discarder:
-      days-to-keep: 30
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-    triggers:
-      - gerrit-trigger-silent-patch-merged:
-          name: 'src/xds/{project}'
-          branch: '{aglbranch}'
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-    builders:
-      - multijob:
-          name: CI-merge-{project}
-          condition: SUCCESSFUL
-          projects:
-            - name: 'ci-xds-{project}-merge-{aglbranch}'
-              current-parameters: true
-              #abort-all-job: true
-              kill-phase-on: FAILURE
-              predefined-parameters: AGLBRANCH={aglbranch}
-      - multijob:
-          name: CIB-{project}-{aglbranch}-finish-success
-          condition: SUCCESSFUL
-          projects:
-            - name: 'ci-xds-{project}-merge-finish-success'
-              current-parameters: true
-              abort-all-job: true
-              kill-phase-on: FAILURE
-
-#      - ci-xds-{project}-merge-{aglbranch}
-################################################################################
-################################################################################
-- job-template:
-    name: 'ci-xds-{project}-merge-{aglbranch}'
-    project-type: freestyle
-    concurrent: true
-    node: agl-test-slave
-    parameters:
-      - string:
-          name: GERRIT_PROJECT
-          default: 'src/xds/{project}'
-          description: "Project to build"
-      - string:
-          name: GERRIT_BRANCH
-          default: '{aglbranch}'
-          description: "branch to build"
-      - string:
-          name: GERRIT_REFSPEC
-          default: refs/heads/{aglbranch}
-          description: "refspec to build"
-      - string:
-          name: GERRIT_CHANGE_NUMBER
-          default: ""
-          description: "change # to build"
-      - string:
-          name: GERRIT_PATCHSET_NUMBER
-          default: ""
-          description: "patchset # to build"
-      - string:
-          name: TARGETARCH
-          default: '{architecture}'
-          description: "Machine to build"
-      - string:
-          name: AGLBRANCH
-          default: '{aglbranch}'
-          description: "AGL release branch to use"
-      - string:
-          name: PROJECT_TO_BUILD
-          default: '{project}'
-          description: 'plain project name'
-
-    build-discarder:
-      days-to-keep: 30
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-      - openstack:
-          single-use: true
-
-    builders:
-      - shell:
-          # including from ../common
-          !include-raw-escape:
-          - ../common/include-xds-header.sh
-          - ../common/include-xds-build-common.sh
-          - ../common/include-xds-prepare-upload-folder-merged.sh
-          - ../common/include-xds-rsync-download-xds.sh
-
-
-    publishers:
-      - naginator:
-          rerun-unstable-builds: true
-          progressive-delay-increment: 5
-          progressive-delay-maximum: 15
-          max-failed-builds: 2
-          #regular-expression: "Unexpected termination of the channel"
-
-
-#      - ci-xds-{project}-merge-finish-success
-################################################################################
-################################################################################
-- job-template:
-    name: 'ci-xds-{project}-merge-finish-success'
-    project-type: freestyle
-    concurrent: true
-    node: control-slave
-    parameters:
-      - string:
-          name: GERRIT_PROJECT
-          default: 'src/xds/{project}'
-          description: "Project to build"
-      - string:
-          name: GERRIT_BRANCH
-          default: '{aglbranch}'
-          description: "branch to build"
-      - string:
-          name: GERRIT_REFSPEC
-          default: 'refs/heads/{aglbranch}'
-          description: "refspec to build"
-      - string:
-          name: GERRIT_CHANGE_NUMBER
-          default: "8313"
-          description: "change # to build"
-      - string:
-          name: GERRIT_PATCHSET_NUMBER
-          default: "2"
-          description: "patchset # to build"
-      - string:
-          name: AGLBRANCH
-          default: '{aglbranch}'
-          description: "AGL release branch to use"
-    build-discarder:
-      days-to-keep: 30
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-    builders:
-      - shell: |
-          ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-image-build=+1 -n NONE --message="Merge\ finished,\ Artifacts\ available\ at\ https://download.automotivelinux.org/AGL/xds/{project}/\ ." || true
-
-
-#      - ci-xds-{project}-remove-artifacts
-################################################################################
-################################################################################
-- job-template:
-    name: 'ci-xds-{project}-remove-artifacts'
-    project-type: freestyle
-    concurrent: true
-    node: control-slave
-    parameters:
-      - string:
-          name: GERRIT_PROJECT
-          default: 'src/xds/{project}'
-          description: "Project to build"
-      - string:
-          name: GERRIT_BRANCH
-          default: '{aglbranch}'
-          description: "branch to build"
-      - string:
-          name: GERRIT_REFSPEC
-          default: refs/heads/{aglbranch}
-          description: "refspec to build"
-      - string:
-          name: GERRIT_CHANGE_NUMBER
-          default: "9551"
-          description: "change # to build"
-      - string:
-          name: GERRIT_PATCHSET_NUMBER
-          default: "2"
-          description: "patchset # to build"
-    build-discarder:
-      days-to-keep: 30
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-      - openstack:
-          single-use: false
-    triggers:
-      - gerrit-trigger-silent-patch-merged-abandoned:
-          name: 'src/xds/{project}'
-          branch: 'refs/heads/{aglbranch}'
-    builders:
-      - shell:
-          !include-raw-escape:
-          - ../common/include-agl-remove-artifacts-changeid.sh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/jjb/ci-xds-verify/ci-xds-local.sh b/jjb/ci-xds-verify/ci-xds-local.sh
deleted file mode 100755
index 7e70838b..00000000
--- a/jjb/ci-xds-verify/ci-xds-local.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-#set -x
-export AGLBRANCH=master
-export GERRIT_PROJECT="src/xds/xds-server"
-export PROJECT_TO_BUILD="xds-server"
-
-#export GERRIT_REFSPEC="refs/changes/99/10799/1"
-#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"
-
-export -p > env.save
-
-
-. ../common/include-xds-header.sh
-. ../common/include-xds-build-common.sh
-
-
-source env.save
diff --git a/jjb/common/include-agl-app-run-test-short.sh b/jjb/common/OLD/include-agl-app-run-test-short.sh
index e1bd6998..e1bd6998 100644
--- a/jjb/common/include-agl-app-run-test-short.sh
+++ b/jjb/common/OLD/include-agl-app-run-test-short.sh
diff --git a/jjb/common/include-agl-bitbake-image-fake.sh b/jjb/common/OLD/include-agl-bitbake-image-fake.sh
index 7cd81c12..7cd81c12 100644
--- a/jjb/common/include-agl-bitbake-image-fake.sh
+++ b/jjb/common/OLD/include-agl-bitbake-image-fake.sh
diff --git a/jjb/common/include-agl-local-conf-isafw.sh b/jjb/common/OLD/include-agl-local-conf-isafw.sh
index 5da94cd6..5da94cd6 100644
--- a/jjb/common/include-agl-local-conf-isafw.sh
+++ b/jjb/common/OLD/include-agl-local-conf-isafw.sh
diff --git a/jjb/common/include-agl-local-conf-rpi3-imagetype.sh b/jjb/common/OLD/include-agl-local-conf-rpi3-imagetype.sh
index 3d4e3cb5..3d4e3cb5 100644
--- a/jjb/common/include-agl-local-conf-rpi3-imagetype.sh
+++ b/jjb/common/OLD/include-agl-local-conf-rpi3-imagetype.sh
diff --git a/jjb/common/include-agl-bitbake-image-nofail.sh b/jjb/common/include-agl-bitbake-image-nofail.sh
index 8f6320c2..a215cbbf 100644
--- a/jjb/common/include-agl-bitbake-image-nofail.sh
+++ b/jjb/common/include-agl-bitbake-image-nofail.sh
@@ -5,10 +5,6 @@
 ## bitbake the image
 ################################################################################
 
-#if ! test x"${GERRIT_BRANCH}" = x"dab" ; then
-#bitbake wic-tools
-#fi
-
 # finally, build the agl-demo-platform (we retry to catch the tar-native bug)
 ( ( bitbake $TARGETIMAGE ) || ( echo '## Failed once, retry ..  ##' ; sync ; sleep 2 ;  bitbake -v -v $TARGETIMAGE ) ) || ( echo '## Failed again, bail out ...' ; exit 0 ) 
 
diff --git a/jjb/common/include-agl-bitbake-image.sh b/jjb/common/include-agl-bitbake-image.sh
index dd65a6b6..3372f47f 100644
--- a/jjb/common/include-agl-bitbake-image.sh
+++ b/jjb/common/include-agl-bitbake-image.sh
@@ -5,16 +5,9 @@
 ## bitbake the image
 ################################################################################
 
-#if ! test x"${GERRIT_BRANCH}" = x"dab" ; then
-#bitbake wic-tools
-#fi
-
 cat conf/local.conf
 
-
 # finally, build the agl-demo-platform (we retry to catch the tar-native bug)
 ( ( bitbake $TARGETIMAGE ) || ( echo '## Failed once, retry ..  ##' ; sync ; sleep 2 ;  bitbake -v -v $TARGETIMAGE ) ) || ( echo '## Failed again, bail out ...' ; exit 1 ) 
 
-#bitbake --dump-signature $TARGETIMAGE
-#cp locked-sigs.inc tmp/deploy/images/
 du -hs tmp/deploy/*
diff --git a/jjb/common/include-agl-bitbake-sdk.sh b/jjb/common/include-agl-bitbake-sdk.sh
index bf51beb3..237208cf 100644
--- a/jjb/common/include-agl-bitbake-sdk.sh
+++ b/jjb/common/include-agl-bitbake-sdk.sh
@@ -4,12 +4,8 @@
 ################################################################################
 ## bitbake the sdk
 ################################################################################
-#if ! test x"${GERRIT_BRANCH}" = x"dab" ; then
-#bitbake wic-tools
-#fi
 
 # 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 ) 
 ( ( bitbake $TARGETSDKIMAGE ) || ( echo '## Failed once, retry ..  ##' ; sync ; sleep 2 ; bitbake $TARGETSDKIMAGE ) ) || ( echo '## Failed again, bail out ... ##' ; exit 1 ) 
 
 du -hs tmp/deploy/*
diff --git a/jjb/common/include-agl-header.sh b/jjb/common/include-agl-header.sh
index 5f1a6667..90ee0ce8 100644
--- a/jjb/common/include-agl-header.sh
+++ b/jjb/common/include-agl-header.sh
@@ -33,10 +33,10 @@ export TARGETFEATURESnogfx="agl-ci-change-features-nogfx agl-ci"
 export TARGETFEATURES="agl-ci-change-features agl-ci"
 
 export TARGETQA=""
-export TARGETIMAGE="agl-demo-platform\${TARGETQA}"
-export TARGETIMAGEnogfx="agl-image-ivi-crosssdk"
+export TARGETIMAGE="agl-ivi-demo-qt"
+export TARGETIMAGEnogfx="agl-ivi-demo-qt"
 
-export TARGETSDKIMAGE="agl-demo-platform-crosssdk"
+export TARGETSDKIMAGE="agl-ivi-demo-qt-crosssdk"
 
 
 # apply GERRIT_*
@@ -132,32 +132,14 @@ if test -n "${BUILDONLY}" ; then
     fi
 fi
 
-# The exceptions
-if $NOGFX; then
-    export TARGETIMAGE=${TARGETIMAGEnogfx}
-    export TARGETFEATURES="${TARGETFEATURESnogfx}"
-fi
-# porter-nogfx means no graphic drivers
-if test x"porter-nogfx" = x"$MACHINE"; then
-    export TARGETIMAGE=${TARGETIMAGEnogfx}
-    export TARGETFEATURES="${TARGETFEATURESnogfx}"
-    export TARGETMACHINE="porter"
-    export TARGETSDKIMAGE="agl-image-ivi-crosssdk"
-fi
 # m3ulcb-nogfx means no graphic drivers
 if test x"m3ulcb-nogfx" = x"$MACHINE"; then
-    export TARGETIMAGE=${TARGETIMAGEnogfx}
     export TARGETFEATURES="${TARGETFEATURESnogfx}"
     export TARGETMACHINE="m3ulcb"
-    export TARGETSDKIMAGE="agl-image-ivi-crosssdk"
 fi
 set -x
 # h3ulcb-nogfx means no graphic drivers
 if test x"h3ulcb-nogfx" = x"$MACHINE"; then
-    if [ "${TARGETBRANCH}" = 'jellyfish' -o "${TARGETBRANCH}" = 'halibut' ];then
-        export TARGETIMAGE=${TARGETIMAGEnogfx}
-        export TARGETSDKIMAGE="agl-image-ivi-crosssdk"
-    fi
     export TARGETFEATURES="${TARGETFEATURESnogfx} agl-refhw-h3"
     export TARGETMACHINE="h3ulcb"
 fi
@@ -165,9 +147,6 @@ set +x
 
 if test x"raspberrypi4" = x"${MACHINE}" ; then
     export TARGETMACHINE="raspberrypi4-64"
-    if test x"halibut" = x"${TARGETBRANCH}" ; then
-        export TARGETMACHINE="raspberrypi4"
-    fi
 fi
 
 #if $DEBUG; then
@@ -183,18 +162,3 @@ if test ! -f ~/.gitconfig ; then
   git config --global user.email "jenkins-dontreply@build.automotivelinux.org"
   git config --global user.name "jenkins-dontreply@build.automotivelinux.org"
 fi
-
-
-
-##### needlefish integration
-if test x"lamprey" != x"${TARGETBRANCH}" ; then
-    if test x"bbe" = x"${TARGETMACHINE}" ; then
-      echo "Target only works for TELEMATICS PROFILE. Select this:"
-      echo "TARGETFEATURES=\"${TARGETFEATURESnogfx}\""
-      TARGETFEATURES="${TARGETFEATURESnogfx}"
-      echo "TARGETIMAGE=\"agl-telematics-demo-platform\""
-      echo "TARGETSDKIMAGE=\"agl-telematics-demo-platform\""
-      TARGETIMAGE="agl-telematics-demo-platform"
-      TARGETSDKIMAGE="agl-telematics-demo-platform"
-    fi
-fi
diff --git a/jjb/common/include-agl-limit-parallelism.sh b/jjb/common/include-agl-limit-parallelism.sh
index 05cbc2b2..3305856a 100644
--- a/jjb/common/include-agl-limit-parallelism.sh
+++ b/jjb/common/include-agl-limit-parallelism.sh
@@ -2,8 +2,8 @@
 # Throttle threads to 6
 cat << EOF >> conf/auto.conf
 
-#BB_NUMBER_THREADS = "5"
-#BB_NUMBER_PARSE_THREADS = "8"
-#PARALLEL_MAKE = "-j5"
+BB_NUMBER_THREADS = "6"
+BB_NUMBER_PARSE_THREADS = "6"
+PARALLEL_MAKE = "-j6"
 
 EOF
diff --git a/jjb/common/include-agl-run-test-short-flounder.sh b/jjb/common/include-agl-run-test-short-flounder.sh
deleted file mode 100644
index fa949741..00000000
--- a/jjb/common/include-agl-run-test-short-flounder.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de
-# License GPLv2
-
-################################################################################
-## Run SHORT CI test
-################################################################################
-
-#set -x
-
-cd $REPODIR
-
-echo "# LAVA lab target: ${LAVA_LAB} #"
-# releng-scripts depends on jinja2 >= 2.9
-echo "## Check version of python-jinja2: "
-pip show jinja2
-CREATE_ARGS=""
-CREATE_ARGS+="--machine ${releng_device} "
-CREATE_ARGS+="--build-type release "
-#[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH "
-#[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION "
-CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ "
-BUILD_VERSION="AGL-gerrit-$RELEASE_BRANCH-$RELEASE_VERSION"
-[[ -e output/repo-manifest-r.txt.sha1 ]] && BUILD_VERSION+="-$(cat output/repo-manifest-r.txt.sha1)"
-CREATE_ARGS+="--name AGL-gerrit-$RELEASE_BRANCH-$RELEASE_VERSION "
-CREATE_ARGS+="--build-version $BUILD_VERSION "
-CREATE_ARGS+="--callback-from ${LAVA_LAB} "
-$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml
-
-if [ $? != 0 ]; then
-    echo "ERROR: Machine ${releng_device}: LAVA job creation failed."
-    exit 0
-else
-    cat testjob.yaml
-fi
diff --git a/jjb/common/include-agl-run-test-short-halibut.sh b/jjb/common/include-agl-run-test-short-halibut.sh
deleted file mode 100644
index 91f0a57f..00000000
--- a/jjb/common/include-agl-run-test-short-halibut.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de
-# License GPLv2
-
-################################################################################
-## Run SHORT CI test
-################################################################################
-
-#set -x
-
-UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci
-UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}
-
-cd $REPODIR
-
-wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info"
-if [ -e build-info ]; then
-	cat build-info
-	source build-info
-fi
-
-echo "# LAVA lab target: ${LAVA_LAB} #"
-# releng-scripts depends on jinja2 >= 2.9
-echo "## Check version of python-jinja2: "
-pip show jinja2
-CREATE_ARGS=""
-CREATE_ARGS+="--machine ${releng_device} "
-CREATE_ARGS+="--build-type release "
-#[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH "
-#[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION "
-CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ "
-CREATE_ARGS+="--name AGL-gerrit-$DIST_BB_AGL_BRANCH-$DIST_BB_AGLVERSION "
-[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION "
-[[ ! -z $DIST_BUILD_HASH ]] && CREATE_ARGS+="--commit $DIST_BUILD_HASH "
-[[ ! -z $DIST_BUILD_ID ]] && CREATE_ARGS+="--build-id $DIST_BUILD_ID "
-[[ ! -z $DIST_BB_AGL_BRANCH ]] && CREATE_ARGS+="--branch $DIST_BB_AGL_BRANCH "
-[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION "
-CREATE_ARGS+="--callback-from ${LAVA_LAB} "
-$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml
-
-if [ $? != 0 ]; then
-    echo "ERROR: Machine ${releng_device}: LAVA job creation failed."
-    exit 0
-else
-    cat testjob.yaml
-fi
diff --git a/jjb/common/include-agl-run-test-short-icefish.sh b/jjb/common/include-agl-run-test-short-icefish.sh
deleted file mode 100644
index 91f0a57f..00000000
--- a/jjb/common/include-agl-run-test-short-icefish.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de
-# License GPLv2
-
-################################################################################
-## Run SHORT CI test
-################################################################################
-
-#set -x
-
-UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci
-UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}
-
-cd $REPODIR
-
-wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info"
-if [ -e build-info ]; then
-	cat build-info
-	source build-info
-fi
-
-echo "# LAVA lab target: ${LAVA_LAB} #"
-# releng-scripts depends on jinja2 >= 2.9
-echo "## Check version of python-jinja2: "
-pip show jinja2
-CREATE_ARGS=""
-CREATE_ARGS+="--machine ${releng_device} "
-CREATE_ARGS+="--build-type release "
-#[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH "
-#[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION "
-CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ "
-CREATE_ARGS+="--name AGL-gerrit-$DIST_BB_AGL_BRANCH-$DIST_BB_AGLVERSION "
-[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION "
-[[ ! -z $DIST_BUILD_HASH ]] && CREATE_ARGS+="--commit $DIST_BUILD_HASH "
-[[ ! -z $DIST_BUILD_ID ]] && CREATE_ARGS+="--build-id $DIST_BUILD_ID "
-[[ ! -z $DIST_BB_AGL_BRANCH ]] && CREATE_ARGS+="--branch $DIST_BB_AGL_BRANCH "
-[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION "
-CREATE_ARGS+="--callback-from ${LAVA_LAB} "
-$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml
-
-if [ $? != 0 ]; then
-    echo "ERROR: Machine ${releng_device}: LAVA job creation failed."
-    exit 0
-else
-    cat testjob.yaml
-fi
diff --git a/jjb/common/include-agl-run-test-short-jellyfish.sh b/jjb/common/include-agl-run-test-short-jellyfish.sh
deleted file mode 100644
index 91f0a57f..00000000
--- a/jjb/common/include-agl-run-test-short-jellyfish.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de
-# License GPLv2
-
-################################################################################
-## Run SHORT CI test
-################################################################################
-
-#set -x
-
-UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci
-UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}
-
-cd $REPODIR
-
-wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info"
-if [ -e build-info ]; then
-	cat build-info
-	source build-info
-fi
-
-echo "# LAVA lab target: ${LAVA_LAB} #"
-# releng-scripts depends on jinja2 >= 2.9
-echo "## Check version of python-jinja2: "
-pip show jinja2
-CREATE_ARGS=""
-CREATE_ARGS+="--machine ${releng_device} "
-CREATE_ARGS+="--build-type release "
-#[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH "
-#[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION "
-CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ "
-CREATE_ARGS+="--name AGL-gerrit-$DIST_BB_AGL_BRANCH-$DIST_BB_AGLVERSION "
-[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION "
-[[ ! -z $DIST_BUILD_HASH ]] && CREATE_ARGS+="--commit $DIST_BUILD_HASH "
-[[ ! -z $DIST_BUILD_ID ]] && CREATE_ARGS+="--build-id $DIST_BUILD_ID "
-[[ ! -z $DIST_BB_AGL_BRANCH ]] && CREATE_ARGS+="--branch $DIST_BB_AGL_BRANCH "
-[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION "
-CREATE_ARGS+="--callback-from ${LAVA_LAB} "
-$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml
-
-if [ $? != 0 ]; then
-    echo "ERROR: Machine ${releng_device}: LAVA job creation failed."
-    exit 0
-else
-    cat testjob.yaml
-fi
diff --git a/jjb/common/include-agl-run-test-short-koi.sh b/jjb/common/include-agl-run-test-short-koi.sh
deleted file mode 100644
index 91f0a57f..00000000
--- a/jjb/common/include-agl-run-test-short-koi.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de
-# License GPLv2
-
-################################################################################
-## Run SHORT CI test
-################################################################################
-
-#set -x
-
-UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci
-UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}
-
-cd $REPODIR
-
-wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info"
-if [ -e build-info ]; then
-	cat build-info
-	source build-info
-fi
-
-echo "# LAVA lab target: ${LAVA_LAB} #"
-# releng-scripts depends on jinja2 >= 2.9
-echo "## Check version of python-jinja2: "
-pip show jinja2
-CREATE_ARGS=""
-CREATE_ARGS+="--machine ${releng_device} "
-CREATE_ARGS+="--build-type release "
-#[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH "
-#[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION "
-CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ "
-CREATE_ARGS+="--name AGL-gerrit-$DIST_BB_AGL_BRANCH-$DIST_BB_AGLVERSION "
-[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION "
-[[ ! -z $DIST_BUILD_HASH ]] && CREATE_ARGS+="--commit $DIST_BUILD_HASH "
-[[ ! -z $DIST_BUILD_ID ]] && CREATE_ARGS+="--build-id $DIST_BUILD_ID "
-[[ ! -z $DIST_BB_AGL_BRANCH ]] && CREATE_ARGS+="--branch $DIST_BB_AGL_BRANCH "
-[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION "
-CREATE_ARGS+="--callback-from ${LAVA_LAB} "
-$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml
-
-if [ $? != 0 ]; then
-    echo "ERROR: Machine ${releng_device}: LAVA job creation failed."
-    exit 0
-else
-    cat testjob.yaml
-fi
diff --git a/jjb/common/include-agl-run-test-short-lamprey.sh b/jjb/common/include-agl-run-test-short-lamprey.sh
deleted file mode 100644
index 91f0a57f..00000000
--- a/jjb/common/include-agl-run-test-short-lamprey.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de
-# License GPLv2
-
-################################################################################
-## Run SHORT CI test
-################################################################################
-
-#set -x
-
-UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci
-UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}
-
-cd $REPODIR
-
-wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info"
-if [ -e build-info ]; then
-	cat build-info
-	source build-info
-fi
-
-echo "# LAVA lab target: ${LAVA_LAB} #"
-# releng-scripts depends on jinja2 >= 2.9
-echo "## Check version of python-jinja2: "
-pip show jinja2
-CREATE_ARGS=""
-CREATE_ARGS+="--machine ${releng_device} "
-CREATE_ARGS+="--build-type release "
-#[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH "
-#[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION "
-CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ "
-CREATE_ARGS+="--name AGL-gerrit-$DIST_BB_AGL_BRANCH-$DIST_BB_AGLVERSION "
-[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION "
-[[ ! -z $DIST_BUILD_HASH ]] && CREATE_ARGS+="--commit $DIST_BUILD_HASH "
-[[ ! -z $DIST_BUILD_ID ]] && CREATE_ARGS+="--build-id $DIST_BUILD_ID "
-[[ ! -z $DIST_BB_AGL_BRANCH ]] && CREATE_ARGS+="--branch $DIST_BB_AGL_BRANCH "
-[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION "
-CREATE_ARGS+="--callback-from ${LAVA_LAB} "
-$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml
-
-if [ $? != 0 ]; then
-    echo "ERROR: Machine ${releng_device}: LAVA job creation failed."
-    exit 0
-else
-    cat testjob.yaml
-fi
diff --git a/jjb/common/include-agl-run-test-short-marlin.sh b/jjb/common/include-agl-run-test-short-marlin.sh
deleted file mode 100644
index 91f0a57f..00000000
--- a/jjb/common/include-agl-run-test-short-marlin.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de
-# License GPLv2
-
-################################################################################
-## Run SHORT CI test
-################################################################################
-
-#set -x
-
-UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci
-UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}
-
-cd $REPODIR
-
-wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info"
-if [ -e build-info ]; then
-	cat build-info
-	source build-info
-fi
-
-echo "# LAVA lab target: ${LAVA_LAB} #"
-# releng-scripts depends on jinja2 >= 2.9
-echo "## Check version of python-jinja2: "
-pip show jinja2
-CREATE_ARGS=""
-CREATE_ARGS+="--machine ${releng_device} "
-CREATE_ARGS+="--build-type release "
-#[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH "
-#[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION "
-CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ "
-CREATE_ARGS+="--name AGL-gerrit-$DIST_BB_AGL_BRANCH-$DIST_BB_AGLVERSION "
-[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION "
-[[ ! -z $DIST_BUILD_HASH ]] && CREATE_ARGS+="--commit $DIST_BUILD_HASH "
-[[ ! -z $DIST_BUILD_ID ]] && CREATE_ARGS+="--build-id $DIST_BUILD_ID "
-[[ ! -z $DIST_BB_AGL_BRANCH ]] && CREATE_ARGS+="--branch $DIST_BB_AGL_BRANCH "
-[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION "
-CREATE_ARGS+="--callback-from ${LAVA_LAB} "
-$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml
-
-if [ $? != 0 ]; then
-    echo "ERROR: Machine ${releng_device}: LAVA job creation failed."
-    exit 0
-else
-    cat testjob.yaml
-fi
diff --git a/jjb/common/include-agl-run-test-short-needlefish.sh b/jjb/common/include-agl-run-test-short-needlefish.sh
deleted file mode 100644
index 91f0a57f..00000000
--- a/jjb/common/include-agl-run-test-short-needlefish.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de
-# License GPLv2
-
-################################################################################
-## Run SHORT CI test
-################################################################################
-
-#set -x
-
-UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci
-UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}
-
-cd $REPODIR
-
-wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info"
-if [ -e build-info ]; then
-	cat build-info
-	source build-info
-fi
-
-echo "# LAVA lab target: ${LAVA_LAB} #"
-# releng-scripts depends on jinja2 >= 2.9
-echo "## Check version of python-jinja2: "
-pip show jinja2
-CREATE_ARGS=""
-CREATE_ARGS+="--machine ${releng_device} "
-CREATE_ARGS+="--build-type release "
-#[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH "
-#[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION "
-CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ "
-CREATE_ARGS+="--name AGL-gerrit-$DIST_BB_AGL_BRANCH-$DIST_BB_AGLVERSION "
-[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION "
-[[ ! -z $DIST_BUILD_HASH ]] && CREATE_ARGS+="--commit $DIST_BUILD_HASH "
-[[ ! -z $DIST_BUILD_ID ]] && CREATE_ARGS+="--build-id $DIST_BUILD_ID "
-[[ ! -z $DIST_BB_AGL_BRANCH ]] && CREATE_ARGS+="--branch $DIST_BB_AGL_BRANCH "
-[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION "
-CREATE_ARGS+="--callback-from ${LAVA_LAB} "
-$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml
-
-if [ $? != 0 ]; then
-    echo "ERROR: Machine ${releng_device}: LAVA job creation failed."
-    exit 0
-else
-    cat testjob.yaml
-fi
diff --git a/jjb/common/include-agl-run-test-short-octopus.sh b/jjb/common/include-agl-run-test-short-octopus.sh
deleted file mode 100644
index 91f0a57f..00000000
--- a/jjb/common/include-agl-run-test-short-octopus.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de
-# License GPLv2
-
-################################################################################
-## Run SHORT CI test
-################################################################################
-
-#set -x
-
-UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci
-UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}
-
-cd $REPODIR
-
-wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info"
-if [ -e build-info ]; then
-	cat build-info
-	source build-info
-fi
-
-echo "# LAVA lab target: ${LAVA_LAB} #"
-# releng-scripts depends on jinja2 >= 2.9
-echo "## Check version of python-jinja2: "
-pip show jinja2
-CREATE_ARGS=""
-CREATE_ARGS+="--machine ${releng_device} "
-CREATE_ARGS+="--build-type release "
-#[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH "
-#[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION "
-CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ "
-CREATE_ARGS+="--name AGL-gerrit-$DIST_BB_AGL_BRANCH-$DIST_BB_AGLVERSION "
-[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION "
-[[ ! -z $DIST_BUILD_HASH ]] && CREATE_ARGS+="--commit $DIST_BUILD_HASH "
-[[ ! -z $DIST_BUILD_ID ]] && CREATE_ARGS+="--build-id $DIST_BUILD_ID "
-[[ ! -z $DIST_BB_AGL_BRANCH ]] && CREATE_ARGS+="--branch $DIST_BB_AGL_BRANCH "
-[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION "
-CREATE_ARGS+="--callback-from ${LAVA_LAB} "
-$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml
-
-if [ $? != 0 ]; then
-    echo "ERROR: Machine ${releng_device}: LAVA job creation failed."
-    exit 0
-else
-    cat testjob.yaml
-fi
diff --git a/jjb/common/include-agl-run-test-short-pike.sh b/jjb/common/include-agl-run-test-short-pike.sh
deleted file mode 100644
index 91f0a57f..00000000
--- a/jjb/common/include-agl-run-test-short-pike.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de
-# License GPLv2
-
-################################################################################
-## Run SHORT CI test
-################################################################################
-
-#set -x
-
-UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci
-UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}
-
-cd $REPODIR
-
-wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info"
-if [ -e build-info ]; then
-	cat build-info
-	source build-info
-fi
-
-echo "# LAVA lab target: ${LAVA_LAB} #"
-# releng-scripts depends on jinja2 >= 2.9
-echo "## Check version of python-jinja2: "
-pip show jinja2
-CREATE_ARGS=""
-CREATE_ARGS+="--machine ${releng_device} "
-CREATE_ARGS+="--build-type release "
-#[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH "
-#[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION "
-CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ "
-CREATE_ARGS+="--name AGL-gerrit-$DIST_BB_AGL_BRANCH-$DIST_BB_AGLVERSION "
-[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION "
-[[ ! -z $DIST_BUILD_HASH ]] && CREATE_ARGS+="--commit $DIST_BUILD_HASH "
-[[ ! -z $DIST_BUILD_ID ]] && CREATE_ARGS+="--build-id $DIST_BUILD_ID "
-[[ ! -z $DIST_BB_AGL_BRANCH ]] && CREATE_ARGS+="--branch $DIST_BB_AGL_BRANCH "
-[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION "
-CREATE_ARGS+="--callback-from ${LAVA_LAB} "
-$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml
-
-if [ $? != 0 ]; then
-    echo "ERROR: Machine ${releng_device}: LAVA job creation failed."
-    exit 0
-else
-    cat testjob.yaml
-fi
diff --git a/jjb/common/include-agl-run-test-short-guppy.sh b/jjb/common/include-agl-run-test-short-releaseit.sh
index 91f0a57f..91f0a57f 100644
--- a/jjb/common/include-agl-run-test-short-guppy.sh
+++ b/jjb/common/include-agl-run-test-short-releaseit.sh
diff --git a/jjb/common/include-agl-set-compositor-image.sh b/jjb/common/include-agl-set-compositor-image.sh
index 4419e4ac..2ecae44e 100644
--- a/jjb/common/include-agl-set-compositor-image.sh
+++ b/jjb/common/include-agl-set-compositor-image.sh
@@ -9,13 +9,10 @@ set -e
 ## Header
 ################################################################################
 
-# only run on master, jellyfish and icefish
-( echo "master marlin jellyfish icefish koi lamprey" | grep -q $TARGETBRANCH ) || exit 0
-
 # Use the agl-compositor
 export TARGETFEATURES="agl-demo agl-devel agl-netboot"
 export TARGETQA=""
-export TARGETIMAGE="agl-demo-platform"
+export TARGETIMAGE="agl-ivi-demo-platform"
 
 eval TARGETIMAGE="$TARGETIMAGE"
 eval TARGETIMAGEnogfx="$TARGETIMAGE"
diff --git a/jjb/common/include-agl-set-flutter-demo-image.sh b/jjb/common/include-agl-set-flutter-demo-image.sh
index c20372de..7b97a081 100644
--- a/jjb/common/include-agl-set-flutter-demo-image.sh
+++ b/jjb/common/include-agl-set-flutter-demo-image.sh
@@ -9,12 +9,9 @@ set -e
 ## Header
 ################################################################################
 
-# only run on master, jellyfish and icefish
-! ( echo "marlin jellyfish lamprey koi" | grep -q $TARGETBRANCH ) || exit 0
-
 export TARGETFEATURES="agl-demo agl-devel agl-ci"
 export TARGETQA=""
-export TARGETIMAGE="agl-ivi-demo-platform-flutter"
+export TARGETIMAGE="agl-ivi-demo-flutter"
 
 eval TARGETIMAGE="$TARGETIMAGE"
 eval TARGETIMAGEnogfx="$TARGETIMAGE"
diff --git a/jjb/common/include-agl-set-html5-image.sh b/jjb/common/include-agl-set-html5-image.sh
index 80b95231..d33fb936 100644
--- a/jjb/common/include-agl-set-html5-image.sh
+++ b/jjb/common/include-agl-set-html5-image.sh
@@ -9,12 +9,9 @@ set -e
 ## Header
 ################################################################################
 
-# only run on master, jellyfish and icefish
-#( echo "marlin jellyfish icefish koi lamprey" | grep -q $TARGETBRANCH ) || exit 0
-
 export TARGETFEATURES="agl-demo agl-devel agl-ci"
 export TARGETQA=""
-export TARGETIMAGE="agl-demo-platform-html5"
+export TARGETIMAGE="agl-ivi-demo-html5"
 
 eval TARGETIMAGE="$TARGETIMAGE"
 eval TARGETIMAGEnogfx="$TARGETIMAGE"
diff --git a/jjb/common/include-agl-set-iceg-lxc-image.sh b/jjb/common/include-agl-set-iceg-lxc-image.sh
index b7de3a97..33b48394 100644
--- a/jjb/common/include-agl-set-iceg-lxc-image.sh
+++ b/jjb/common/include-agl-set-iceg-lxc-image.sh
@@ -9,9 +9,6 @@ set -e
 ## Header
 ################################################################################
 
-# only run on master, jellyfish and icefish
-! ( echo "marlin jellyfish icefish koi lamprey" | grep -q $TARGETBRANCH ) || exit 0
-
 export TARGETFEATURES="agl-ic-container agl-devel agl-ci"
 export TARGETQA=""
 export TARGETIMAGE="agl-cluster-demo-lxc-host"
diff --git a/jjb/common/include-apps-header.sh b/jjb/common/include-apps-header.sh
index b9ae1bd6..2ba23e76 100644
--- a/jjb/common/include-apps-header.sh
+++ b/jjb/common/include-apps-header.sh
@@ -12,8 +12,6 @@ set -e
 
 # VARIABLES
 OPTIND=1
-#export DLHOST="http://download.automotivelinux.org/"
-# DLHOST in auto.conf
 export NOGFX=false
 export VERBOSE=false
 export DEBUG=false
@@ -108,12 +106,7 @@ case "$TARGETARCH" in
 	    ;;
 	x86-64)
 	    export TARGETSDKARCH="corei7-64"
-	    # starting with master, we use qemu for the SDK.
-	    if test x"master" = x"$AGLBRANCH" -o x"jellyfish" = x"${AGLBRANCH}" -o x"marlin" = x"${AGLBRANCH}" -o x"lamprey" = x"${AGLBRANCH}" -o x"koi" = x"${AGLBRANCH}" ; then
-		export TARGETSDKMACHINE="qemux86-64"
-	    else
-		export TARGETSDKMACHINE="intel-corei7-64"
-	    fi
+	    export TARGETSDKMACHINE="qemux86-64"
 	    ;;
 	aarch64)
 	    export TARGETSDKARCH="aarch64"
diff --git a/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-build.sh b/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-build.sh
deleted file mode 100644
index c8219e69..00000000
--- a/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-build.sh
+++ /dev/null
@@ -1,221 +0,0 @@
-#!/bin/bash
-# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de
-# License GPLv2
-#
-# debugging purposes
-set -e
-
-# VARIABLES
-OPTIND=1
-export DLHOST="http://download.automotivelinux.org/"
-export NOGFX=false
-export VERBOSE=false
-export DEBUG=false
-function vprint() {
-    :
-}
-function dprint() {
-    :
-}
-
-# defaults for project, branch, refspec
-export TARGETPROJECT="AGL/AGL-repo"
-export TARGETBRANCH="master"
-export TARGETREFSPEC="refs/heads/master"
-
-export TARGETFEATURESnogfx="agl-appfw-smack agl-netboot agl-sota agl-devel"
-export TARGETFEATURES="agl-demo ${TARGETFEATURESnogfx}"
-
-export TARGETQA=""
-export TARGETIMAGE="agl-demo-platform\${TARGETQA}"
-export TARGETIMAGEnogfx="core-image-minimal"
-
-export TARGETRELEASEVERSION=""
-export TARGETRELEASEBRANCH=""
-
-# apply GERRIT_*
-if test -n "${GERRIT_PROJECT}"; then
-export TARGETPROJECT="${GERRIT_PROJECT}"
-fi
-if test -n "${GERRIT_BRANCH}"; then
-    export TARGETBRANCH="${GERRIT_BRANCH}"
-fi
-if test -n "${GERRIT_REFSPEC}"; then
-export TARGETREFSPEC="${GERRIT_REFSPEC}"
-fi
-
-if test -n "${RELEASE_VERSION}"; then
-export TARGETRELEASEVERSION="${RELEASE_VERSION}"
-fi
-
-if test -n "${RELEASE_BRANCH}"; then
-export TARGETRELEASEBRANCH="${RELEASE_BRANCH}"
-export TARGETBRANCH="${RELEASE_BRANCH}"
-export TARGETREFSPEC="refs/heads/${RELEASE_BRANCH}"
-fi
-
-if test x"" = x"${MACHINE}"; then
-    export MACHINE="qemux86-64"
-fi
-
-# finally cmdline arguments
-while getopts ":b:i:p:r:dnqvx" opt; do
-    case "$opt" in
-	b)
-	    export TARGETBRANCH="$OPTARG"
-	    ;;
-	d)
-	    DEBUG=true
-	    function dprint() {
-		echo "DEBUG: $@"
-	    }
-	    ;;
-	i)
-	    export TARGETIMAGE="$OPTARG"
-	    ;;
-	n)
-	    export NOGFX=true
-	    ;;
-	p)
-	    export TARGETPROJECT="$OPTARG"
-	    ;;
-	q)
-	    export TARGETQA="-qa"
-	    ;;
-	r)
-	    export TARGETREFSPEC="$OPTARG"
-	    ;;
-	v)
-	    VERBOSE=true
-	    function vprint() {
-		echo "VERBOSE: \"$@\""
-	    }
-	    ;;
-	x)
-	    set -x
-	    ;;
-	h|\?)
-	    echo "$0 [-h/-?] -bdinpqrvx"
-	    echo "--------------------------------------------------------------------------------"
-	    echo "  -b <branch>  - name of the branch to use          (default=master)"
-	    echo "  -d           - debug"
-	    echo "  -i <image>   - name of the image to build         (default=agl-demo-platform)"
-	    echo "  -n           - no graphics (no wayland, aka no drivers)"
-	    echo "  -p <project> - project to use                     (default=AGL/AGL-repo)"
-	    echo "  -q           - build '*-qa' images                (default='')"
-	    echo "  -r <refspec> - refspec to use                     (default=refs/heads/master)"
-	    echo "  -v           - verbose"
-	    echo "  -x           - set -x"
-	    echo "--------------------------------------------------------------------------------"
-	    echo "  GERRIT_PROJECT, GERRIT_BRANCH, GERRIT_REFSPEC are used if present,"
-	    echo "  but cmdline arguments take precedence."
-	    echo "--------------------------------------------------------------------------------"
-	    exit 1
-	    ;;
-	:)
-	    echo "Option -$OPTARG required an argument."
-	    exit 1
-	    ;;
-    esac
-done
-
-# expand
-eval TARGETIMAGE="$TARGETIMAGE"
-eval TARGETIMAGEnogfx="$TARGETIMAGEnogfx"
-
-if $NOGFX; then
-    export TARGETIMAGE="${TARGETIMAGEnogfx}"
-    export TARGETFEATURES="${TARGETFEATURESnogfx}"
-fi
-if test x"porter-nogfx" = x"$MACHINE"; then
-    export TARGETIMAGE="${TARGETIMAGEnogfx}"
-    export TARGETFEATURES="${TARGETFEATURESnogfx}"
-fi
-
-if test ! x"" = x"$TARGETRELEASEVERSION"; then
-MANIFESTMOD="-m ${TARGETRELEASEBRANCH}_${TARGETRELEASEVERSION}.xml"
-else
-MANIFESTMOD=""
-fi
-
-if $DEBUG; then
-set | grep ^TARGET || true
-set | grep ^GERRIT || true
-set | grep ^MACHINE || true
-fi
-
-
-# create shared downloads and sstate-cache directory
-mkdir -p downloads
-mkdir -p sstate-cache
-
-# remove old files, we want to test a fresh clone
-export XTMP="$$"
-mv repoclone repoclone$XTMP || true
-( rm -rf repoclone$XTMP & ) || true
-mkdir -p repoclone
-cd repoclone
-
-repo init  --repo-branch=repo-1 --reference=/opt/AGL/preclone -q -b $TARGETBRANCH $MANIFESTMOD -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
-
-# next: repo sync and dump manifest
-repo sync --force-sync --detach --no-clone-bundle
-
-# fix up this branch
-MYPROJECT=`echo $TARGETPROJECT | sed -e "s#AGL/##g"`
-
-
-if test -n "${GERRIT_CHANGE_NUMBER}" -a -n "${GERRIT_PATCHSET_NUMBER}"  ; then
-    repo download $MYPROJECT ${GERRIT_CHANGE_NUMBER}/${GERRIT_PATCHSET_NUMBER}
-else
-    if test x"AGL-repo" = x"$MYPROJECT" ; then
-	cd .repo/manifests
-        MYREMOTE=`git remote | head -1`
-        git fetch ${MYREMOTE} ${TARGETREFSPEC}
-        git reset --hard FETCH_HEAD
-	cd ../../
-	repo sync --force-sync -d
-    else
-	cd $MYPROJECT
-	MYREMOTE=`git remote | head -1`
-	git fetch ${MYREMOTE} ${TARGETREFSPEC}
-	git reset --hard FETCH_HEAD
-	cd ..
-    fi
-fi
-
-repo manifest -r
-repo manifest -r > ../current_default.xml
-
-# source the env
-source meta-agl/scripts/aglsetup.sh -m ${MACHINE} -b output ${TARGETFEATURES}
-
-# link the shared downloads and sstate-cache
-ln -sf ../../downloads
-ln -sf ../../sstate-cache
-
-echo "" >> conf/local.conf
-
-#limit parallel number of bitbake jobs and parallel jobs in make
-cat << EOF > conf/auto.conf
-PREMIRRORS = "\
-git://.*/.* ${DLHOST}/AGL/mirror/   \n \
-ftp://.*/.* ${DLHOST}/AGL/mirror/   \n \
-http://.*/.* ${DLHOST}/AGL/mirror/  \n \
-https://.*/.* ${DLHOST}/AGL/mirror/ \n \
-             "
-
-SSTATE_MIRRORS = "\
-file://.* file:///opt/AGL/sstate-mirror/\${MACHINE}/PATH    \n \
-file://.* ${DLHOST}/sstate-mirror/${GERRIT_BRANCH}/\${DEFAULTTUNE}/PATH \n \
-                 "
-
-SSTATE_DIR = "\${TOPDIR}/sstate-cache/\${MACHINE}/"
-EOF
-
-cat conf/auto.conf
-
-# finally, build the agl-demo-platform
-bitbake $TARGETIMAGE
-
-du -hs tmp/deploy/*
diff --git a/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-rsync.sh b/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-rsync.sh
deleted file mode 100644
index aea85c48..00000000
--- a/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-rsync.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-#set -x
-set -e
-
-#ls -alh
-
-export RSYNCSRC="$(pwd)/mirror/"
-export RSYNCDST="jenkins-slave@10.30.72.8:/srv/download/AGL/mirror/"
-
-echo " rsync -avr -e \"ssh -o StrictHostKeyChecking=no\" $RSYNCSRC $RSYNCDST "
-
-if x"true" = x"$UPLOAD" ; then
-echo upload
-fi
-
-exit 0
\ No newline at end of file
diff --git a/jjb/release-jjb-blowfish-snapshot/release-jjb-blowfish-snapshot.yaml b/jjb/release-jjb-blowfish-snapshot/release-jjb-blowfish-snapshot.yaml
deleted file mode 100644
index 4e9a4f4b..00000000
--- a/jjb/release-jjb-blowfish-snapshot/release-jjb-blowfish-snapshot.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
----
-- project:
-    name: release-jjb-blowfish-snapshot
-    jobs:
-      - release-jjb-blowfish-snapshot
-
-- job-template:
-    name: 'release-jjb-blowfish-snapshot'
-    project-type: matrix
-    concurrent: false
-    node: master
-
-    parameters:
-      - string:
-          name: GERRIT_PROJECT
-          default: AGL/AGL-repo
-          description: "Project to build"
-      - string:
-          name: GERRIT_BRANCH
-          default: blowfish
-          description: "branch to build"
-      - string:
-          name: GERRIT_REFSPEC
-          default: refs/heads/blowfish
-          description: "refspec to build"
-      - string:
-          name: UPLOAD
-          default: NO
-          description: "Upload?"
-    axes:
-      - axis:
-          type: user-defined
-          name: MACHINE
-          values:
-            - qemux86
-            - porter-nogfx
-            - intel-corei7-64
-      - 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
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape: include-release-jjb-blowfish-snapshot-build.sh
-      - shell:
-          !include-raw-escape: include-release-jjb-blowfish-snapshot-rsync.sh
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
deleted file mode 100644
index 396dfb1c..00000000
--- a/jjb/release-jjb-chinook-release/include-release-jjb-chinook-release-move-sandbox.sh
+++ /dev/null
@@ -1,27 +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
-
-
-export REMOTESRC="/srv/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/release-jjb-chinook-release.yaml b/jjb/release-jjb-chinook-release/release-jjb-chinook-release.yaml
deleted file mode 100644
index efb95ead..00000000
--- a/jjb/release-jjb-chinook-release/release-jjb-chinook-release.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-- project:
-    name: release-jjb-chinook-release-from-snapshot
-    jobs:
-      - release-jjb-chinook-release-from-snapshot
-
-- job-template:
-    name: 'release-jjb-chinook-release-from-snapshot'
-    project-type: freestyle
-    concurrent: false
-    node: control-slave
-
-    parameters:
-      - string:
-          name: GERRIT_PROJECT
-          default: AGL/AGL-repo
-          description: "Project to build"
-      - string:
-          name: GERRIT_BRANCH
-          default: chinook
-          description: "branch to build"
-      - string:
-          name: GERRIT_REFSPEC
-          default: refs/tags/chinook_3.0.2
-          description: "refspec to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 3.0.2
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: chinook
-          description: "release branch to build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-chinook-release-move-sandbox.sh
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
deleted file mode 100644
index 50944a8f..00000000
--- a/jjb/release-jjb-chinook-snapshot/include-release-jjb-chinook-snapshot-rsync.sh
+++ /dev/null
@@ -1,54 +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}/"
-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
-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
deleted file mode 100644
index eb6ad1d0..00000000
--- a/jjb/release-jjb-chinook-snapshot/release-jjb-chinook-snapshot.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
----
-- project:
-    name: release-jjb-chinook-snapshot
-    jobs:
-      - release-jjb-chinook-snapshot
-
-- job-template:
-    name: 'release-jjb-chinook-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: chinook
-          description: "branch to build"
-      - string:
-          name: GERRIT_REFSPEC
-          default: refs/tags/chinook_3.0.2
-          description: "refspec to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 3.0.2
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: chinook
-          description: "release branch to build"
-      - string:
-          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
-      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: 'refs/tags/chinook/**'
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    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-run-test-prepare.sh
-          - ../common/include-agl-run-test-rsync-release.sh
-          - ../common/include-agl-run-test-short-release.sh
-      - shell:
-          !include-raw-escape: include-release-jjb-chinook-snapshot-rsync.sh
diff --git a/jjb/release-jjb-chinook-sources/include-release-jjb-chinook-release-sources-rsync.sh b/jjb/release-jjb-chinook-sources/include-release-jjb-chinook-release-sources-rsync.sh
deleted file mode 100644
index 599a323e..00000000
--- a/jjb/release-jjb-chinook-sources/include-release-jjb-chinook-release-sources-rsync.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-#set -x
-set -e
-#export RSYNCDST="jenkins-slave@10.30.72.8:/srv/download/AGL/release/${RELEASE_BRANCH}/${RELEASE_VERSION}/"
-#export RSYNCSRC=$(pwd)/UPLOAD/
-
-# construct upload folder
-
-
-BRANCH=${RELEASE_BRANCH}
-RELVER=${RELEASE_VERSION}
-
-rm -rf release-upload || true
-
-git clone -b ${RELEASE_BRANCH} https://gerrit.automotivelinux.org/gerrit/p/staging/release-upload.git
-cd release-upload
-
-gpg --keyserver pgp.mit.edu --recv D6DD2170
-
-ls | grep -q agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.tar.bz2
-
-( gpg --verify agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.tar.bz2.sig agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.tar.bz2 2>&1 | grep -e "Good signature.*Jan-Simon.*Moeller.*AGL.*Release" -q && echo "gpg key verification succeeded" ) || ( echo "gpg key verification failed" && exit 1 )
-
-rm -rf ../UPLOAD || true
-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}/"
-
-if test x"yes" = x"${UPLOAD}" ; then
-   rsync -avr -e "ssh -o StrictHostKeyChecking=no" ${RSYNCSRC}/* ${RSYNCDST}
-fi
diff --git a/jjb/release-jjb-chinook-sources/release-jjb-chinook-sources.yaml b/jjb/release-jjb-chinook-sources/release-jjb-chinook-sources.yaml
deleted file mode 100644
index f532c58d..00000000
--- a/jjb/release-jjb-chinook-sources/release-jjb-chinook-sources.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-- project:
-    name: release-jjb-chinook-sources
-    jobs:
-      - release-jjb-chinook-sources
-
-- job-template:
-    name: 'release-jjb-chinook-sources'
-    project-type: freestyle
-    concurrent: false
-    node: agl-test-slave
-
-    parameters:
-      - string:
-          name: RELEASE_VERSION
-          default: 3.0.2
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: chinook
-          description: "release branch to build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-chinook-release-sources-rsync.sh
diff --git a/jjb/release-jjb-dab-release/include-release-jjb-dab-release-move-sandbox.sh b/jjb/release-jjb-dab-release/include-release-jjb-dab-release-move-sandbox.sh
deleted file mode 100644
index 396dfb1c..00000000
--- a/jjb/release-jjb-dab-release/include-release-jjb-dab-release-move-sandbox.sh
+++ /dev/null
@@ -1,27 +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
-
-
-export REMOTESRC="/srv/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-dab-release/release-jjb-dab-release.yaml b/jjb/release-jjb-dab-release/release-jjb-dab-release.yaml
deleted file mode 100644
index f24cfa32..00000000
--- a/jjb/release-jjb-dab-release/release-jjb-dab-release.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-- project:
-    name: release-jjb-dab-release-from-snapshot
-    jobs:
-      - release-jjb-dab-release-from-snapshot
-
-- job-template:
-    name: 'release-jjb-dab-release-from-snapshot'
-    project-type: freestyle
-    concurrent: false
-    node: control-slave
-
-    parameters:
-      - string:
-          name: GERRIT_PROJECT
-          default: AGL/AGL-repo
-          description: "Project to build"
-      - string:
-          name: GERRIT_BRANCH
-          default: dab
-          description: "branch to build"
-      - string:
-          name: GERRIT_REFSPEC
-          default: refs/tags/dab_4.0.2
-          description: "refspec to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 4.0.2
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: dab
-          description: "release branch to build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-dab-release-move-sandbox.sh
diff --git a/jjb/release-jjb-dab-snapshot/include-release-jjb-dab-snapshot-rsync.sh b/jjb/release-jjb-dab-snapshot/include-release-jjb-dab-snapshot-rsync.sh
deleted file mode 100644
index 3ffeb244..00000000
--- a/jjb/release-jjb-dab-snapshot/include-release-jjb-dab-snapshot-rsync.sh
+++ /dev/null
@@ -1,56 +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 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-dab-snapshot/release-jjb-dab-snapshot.yaml b/jjb/release-jjb-dab-snapshot/release-jjb-dab-snapshot.yaml
deleted file mode 100644
index 79075f88..00000000
--- a/jjb/release-jjb-dab-snapshot/release-jjb-dab-snapshot.yaml
+++ /dev/null
@@ -1,112 +0,0 @@
----
-- project:
-    name: release-jjb-dab-snapshot
-    jobs:
-      - release-jjb-dab-snapshot
-
-- job-template:
-    name: 'release-jjb-dab-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: dab
-          description: "branch to build"
-      - string:
-          name: GERRIT_REFSPEC
-          default: refs/tags/dab_4.0.2
-          description: "refspec to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 4.0.2
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: dab
-          description: "release branch to build"
-      - string:
-          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
-            - m3ulcb-nogfx
-            - dragonboard-410c
-            # 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: 'refs/tags/dab/**'
-
-    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-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
-          - ../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-release.sh
-      - shell:
-          !include-raw-escape: include-release-jjb-dab-snapshot-rsync.sh
diff --git a/jjb/release-jjb-dab-sources/include-release-jjb-dab-release-sources-rsync.sh b/jjb/release-jjb-dab-sources/include-release-jjb-dab-release-sources-rsync.sh
deleted file mode 100644
index 9b40b5ac..00000000
--- a/jjb/release-jjb-dab-sources/include-release-jjb-dab-release-sources-rsync.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-#set -x
-set -e
-#export RSYNCDST="jenkins-slave@10.30.72.8:/srv/download/AGL/release/${RELEASE_BRANCH}/${RELEASE_VERSION}/"
-#export RSYNCSRC=$(pwd)/UPLOAD/
-
-# construct upload folder
-
-
-BRANCH=${RELEASE_BRANCH}
-RELVER=${RELEASE_VERSION}
-
-rm -rf release-upload || true
-
-git clone -b ${RELEASE_BRANCH} https://gerrit.automotivelinux.org/gerrit/p/staging/release-upload.git
-cd release-upload
-
-gpg --keyserver pgp.mit.edu --recv D6DD2170
-
-ls | grep -q agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.tar.bz2
-
-( gpg --verify agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.tar.bz2.sig agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.tar.bz2 2>&1 | grep -e "Good signature.*Jan-Simon.*Moeller.*AGL.*Release" -q && echo "gpg key verification succeeded" ) || ( echo "gpg key verification failed" && exit 1 )
-
-rm -rf ../UPLOAD || true
-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}/"
-
-if test x"yes" = x"${UPLOAD}" ; then
-   ssh -o StrictHostKeyChecking=no jenkins-slave@10.30.72.8 "mkdir -p ${RSYNCDST}"
-   rsync -avr -e "ssh -o StrictHostKeyChecking=no" ${RSYNCSRC}/* ${RSYNCDST}
-fi
diff --git a/jjb/release-jjb-dab-sources/release-jjb-dab-sources.yaml b/jjb/release-jjb-dab-sources/release-jjb-dab-sources.yaml
deleted file mode 100644
index 08203f9b..00000000
--- a/jjb/release-jjb-dab-sources/release-jjb-dab-sources.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-- project:
-    name: release-jjb-dab-sources
-    jobs:
-      - release-jjb-dab-sources
-
-- job-template:
-    name: 'release-jjb-dab-sources'
-    project-type: freestyle
-    concurrent: false
-    node: agl-test-slave
-
-    parameters:
-      - string:
-          name: RELEASE_VERSION
-          default: 3.99.1
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: dab
-          description: "release branch to build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-dab-release-sources-rsync.sh
diff --git a/jjb/release-jjb-eel-release/include-release-jjb-eel-release-move-sandbox.sh b/jjb/release-jjb-eel-release/include-release-jjb-eel-release-move-sandbox.sh
deleted file mode 100644
index 2f85a3ea..00000000
--- a/jjb/release-jjb-eel-release/include-release-jjb-eel-release-move-sandbox.sh
+++ /dev/null
@@ -1,27 +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
-
-
-export REMOTESRC="/srv/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"
-fi
-
-exit 0
\ No newline at end of file
diff --git a/jjb/release-jjb-eel-release/release-jjb-eel-release.yaml b/jjb/release-jjb-eel-release/release-jjb-eel-release.yaml
deleted file mode 100644
index 69b8226f..00000000
--- a/jjb/release-jjb-eel-release/release-jjb-eel-release.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-- project:
-    name: release-jjb-eel-release-from-snapshot
-    jobs:
-      - release-jjb-eel-release-from-snapshot
-
-- job-template:
-    name: 'release-jjb-eel-release-from-snapshot'
-    project-type: freestyle
-    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/eel_5.0.0
-          description: "refspec to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 5.0.0
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: eel
-          description: "release branch to build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-eel-release-move-sandbox.sh
diff --git a/jjb/release-jjb-eel-snapshot/include-release-eel-fix-task-depends.sh b/jjb/release-jjb-eel-snapshot/include-release-eel-fix-task-depends.sh
deleted file mode 100644
index 04644742..00000000
--- a/jjb/release-jjb-eel-snapshot/include-release-eel-fix-task-depends.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-
-# HOTFIX for yocto bug https://bugzilla.yoctoproject.org/show_bug.cgi?id=12070
-echo "" >> conf/local.conf
-echo 'do_image_complete[deptask] += "do_populate_lic"' >> conf/local.conf
diff --git a/jjb/release-jjb-eel-snapshot/release-jjb-eel-snapshot.yaml b/jjb/release-jjb-eel-snapshot/release-jjb-eel-snapshot.yaml
deleted file mode 100644
index 68267dc6..00000000
--- a/jjb/release-jjb-eel-snapshot/release-jjb-eel-snapshot.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
----
-- project:
-    name: release-jjb-eel-snapshot
-    jobs:
-      - release-jjb-eel-snapshot
-
-- job-template:
-    name: 'release-jjb-eel-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: eel
-          description: "branch to build"
-      - string:
-          name: GERRIT_REFSPEC
-          default: refs/tags/eel_5.0.2
-          description: "refspec to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 5.0.2
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: eel
-          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
-            - cyclone5
-            - intel-corei7-64
-            - raspberrypi3
-            - dra7xx-evm
-            - m3ulcb-nogfx
-            - dragonboard-410c
-            # 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: 'tags/eel/**'
-
-    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-DISTROFEATURES-AGLCI.sh
-          - ../common/include-agl-local-conf-vmdk.sh
-          - ../common/include-agl-local-conf-rpi3-imagetype.sh
-          - include-release-eel-fix-task-depends.sh
-          #- ../common/include-agl-bitbake-image.sh
-          - ../common/include-agl-bitbake-sdk.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-release.sh
-      - shell:
-          !include-raw-escape: include-release-jjb-eel-snapshot-rsync.sh
diff --git a/jjb/release-jjb-eel-sources/include-release-jjb-eel-release-sources-rsync.sh b/jjb/release-jjb-eel-sources/include-release-jjb-eel-release-sources-rsync.sh
deleted file mode 100644
index 9b40b5ac..00000000
--- a/jjb/release-jjb-eel-sources/include-release-jjb-eel-release-sources-rsync.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-#set -x
-set -e
-#export RSYNCDST="jenkins-slave@10.30.72.8:/srv/download/AGL/release/${RELEASE_BRANCH}/${RELEASE_VERSION}/"
-#export RSYNCSRC=$(pwd)/UPLOAD/
-
-# construct upload folder
-
-
-BRANCH=${RELEASE_BRANCH}
-RELVER=${RELEASE_VERSION}
-
-rm -rf release-upload || true
-
-git clone -b ${RELEASE_BRANCH} https://gerrit.automotivelinux.org/gerrit/p/staging/release-upload.git
-cd release-upload
-
-gpg --keyserver pgp.mit.edu --recv D6DD2170
-
-ls | grep -q agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.tar.bz2
-
-( gpg --verify agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.tar.bz2.sig agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.tar.bz2 2>&1 | grep -e "Good signature.*Jan-Simon.*Moeller.*AGL.*Release" -q && echo "gpg key verification succeeded" ) || ( echo "gpg key verification failed" && exit 1 )
-
-rm -rf ../UPLOAD || true
-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}/"
-
-if test x"yes" = x"${UPLOAD}" ; then
-   ssh -o StrictHostKeyChecking=no jenkins-slave@10.30.72.8 "mkdir -p ${RSYNCDST}"
-   rsync -avr -e "ssh -o StrictHostKeyChecking=no" ${RSYNCSRC}/* ${RSYNCDST}
-fi
diff --git a/jjb/release-jjb-eel-sources/release-jjb-eel-sources.yaml b/jjb/release-jjb-eel-sources/release-jjb-eel-sources.yaml
deleted file mode 100644
index 1951d399..00000000
--- a/jjb/release-jjb-eel-sources/release-jjb-eel-sources.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-- project:
-    name: release-jjb-eel-sources
-    jobs:
-      - release-jjb-eel-sources
-
-- job-template:
-    name: 'release-jjb-eel-sources'
-    project-type: freestyle
-    concurrent: false
-    node: agl-test-slave
-
-    parameters:
-      - string:
-          name: RELEASE_VERSION
-          default: 4.99.1
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: eel
-          description: "release branch to build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-eel-release-sources-rsync.sh
diff --git a/jjb/release-jjb-flounder-release/release-jjb-release.yaml b/jjb/release-jjb-flounder-release/release-jjb-release.yaml
deleted file mode 100644
index 34add7cf..00000000
--- a/jjb/release-jjb-flounder-release/release-jjb-release.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-- project:
-    name: release-jjb-flounder-release-from-snapshot
-    jobs:
-      - release-jjb-flounder-release-from-snapshot
-
-- job-template:
-    name: 'release-jjb-flounder-release-from-snapshot'
-    project-type: freestyle
-    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/flounder_5.99.1
-          description: "refspec to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 5.99.1
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: flounder
-          description: "release branch to build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-release-move-sandbox.sh
diff --git a/jjb/release-jjb-flounder-snapshot/include-release-jjb-flounder-snapshot-rsync.sh b/jjb/release-jjb-flounder-snapshot/include-release-jjb-flounder-snapshot-rsync.sh
deleted file mode 100644
index 9be7c6f8..00000000
--- a/jjb/release-jjb-flounder-snapshot/include-release-jjb-flounder-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-flounder-snapshot/release-jjb-flounder-snapshot.yaml b/jjb/release-jjb-flounder-snapshot/release-jjb-flounder-snapshot.yaml
deleted file mode 100644
index 0a42908a..00000000
--- a/jjb/release-jjb-flounder-snapshot/release-jjb-flounder-snapshot.yaml
+++ /dev/null
@@ -1,126 +0,0 @@
----
-- project:
-    name: release-jjb-flounder-snapshot
-    jobs:
-      - release-jjb-flounder-snapshot
-
-- job-template:
-    name: 'release-jjb-flounder-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/flounder_6.0.0
-          description: "refspec to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 6.0.0
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: flounder
-          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
-            - intel-corei7-64
-            - raspberrypi3
-            - dra7xx-evm
-            - m3ulcb-nogfx
-            - dragonboard-410c
-            # 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: 'tags/flounder/**'
-
-    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
-      - shell:
-          !include-raw-escape: include-release-jjb-flounder-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-flounder.sh
-          - ../common/include-agl-lava-jobs-submit-only.sh
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
deleted file mode 100644
index e458a17d..00000000
--- a/jjb/release-jjb-flounder-sources/include-release-jjb-release-sources-rsync.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-#set -x
-set -e
-#export RSYNCDST="jenkins-slave@10.30.72.8:/srv/download/AGL/release/${RELEASE_BRANCH}/${RELEASE_VERSION}/"
-#export RSYNCSRC=$(pwd)/UPLOAD/
-
-# construct upload folder
-
-
-BRANCH=${RELEASE_BRANCH}
-RELVER=${RELEASE_VERSION}
-
-rm -rf release-upload || true
-
-git clone -b ${RELEASE_BRANCH} https://gerrit.automotivelinux.org/gerrit/p/staging/release-upload.git
-cd release-upload
-
-gpg --keyserver pool.sks-keyservers.net --recv D6DD2170
-
-ls | grep -q agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.tar.bz2
-
-( gpg --verify agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.tar.bz2.sig agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.tar.bz2 2>&1 | grep -e "Good signature.*Jan-Simon.*Moeller.*AGL.*Release" -q && echo "gpg key verification succeeded" ) || ( echo "gpg key verification failed" && exit 1 )
-
-rm -rf ../UPLOAD || true
-mkdir -p ../UPLOAD/
-
-cp -ar agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.* ../UPLOAD/
-
-export RSYNCSRC=$(pwd)/../UPLOAD
-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}/* 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/jjb/release-jjb-flounder-sources/release-jjb-flounder-sources.yaml b/jjb/release-jjb-flounder-sources/release-jjb-flounder-sources.yaml
deleted file mode 100644
index 4515dfc2..00000000
--- a/jjb/release-jjb-flounder-sources/release-jjb-flounder-sources.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-- project:
-    name: release-jjb-flounder-sources
-    jobs:
-      - release-jjb-flounder-sources
-
-- job-template:
-    name: 'release-jjb-flounder-sources'
-    project-type: freestyle
-    concurrent: false
-    node: agl-test-slave
-
-    parameters:
-      - string:
-          name: RELEASE_VERSION
-          default: 5.99.1
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: flounder
-          description: "release branch to build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-release-sources-rsync.sh
diff --git a/jjb/release-jjb-guppy-release/include-release-jjb-release-move-sandbox.sh b/jjb/release-jjb-guppy-release/include-release-jjb-release-move-sandbox.sh
deleted file mode 100644
index 2f85a3ea..00000000
--- a/jjb/release-jjb-guppy-release/include-release-jjb-release-move-sandbox.sh
+++ /dev/null
@@ -1,27 +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
-
-
-export REMOTESRC="/srv/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"
-fi
-
-exit 0
\ No newline at end of file
diff --git a/jjb/release-jjb-guppy-release/release-jjb-release.yaml b/jjb/release-jjb-guppy-release/release-jjb-release.yaml
deleted file mode 100644
index f1079651..00000000
--- a/jjb/release-jjb-guppy-release/release-jjb-release.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-- project:
-    name: release-jjb-guppy-release-from-snapshot
-    jobs:
-      - release-jjb-guppy-release-from-snapshot
-
-- job-template:
-    name: 'release-jjb-guppy-release-from-snapshot'
-    project-type: freestyle
-    concurrent: false
-    node: control-slave
-
-    parameters:
-      - string:
-          name: GERRIT_BRANCH
-          default: guppy
-          description: "branch to build"
-      - string:
-          name: RELEASE_BRANCH
-          default: guppy
-          description: "release branch to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 7.0.0
-          description: "release version number for build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-release-move-sandbox.sh
-      - trigger-builds:
-        - project: "release-jjb-guppy-sources"
-          current-parameters: true
-          block: true
-          same-node: true
diff --git a/jjb/release-jjb-guppy-snapshot/include-release-jjb-guppy-snapshot-rsync.sh b/jjb/release-jjb-guppy-snapshot/include-release-jjb-guppy-snapshot-rsync.sh
deleted file mode 100644
index 9be7c6f8..00000000
--- a/jjb/release-jjb-guppy-snapshot/include-release-jjb-guppy-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-guppy-snapshot/release-jjb-guppy-snapshot.yaml b/jjb/release-jjb-guppy-snapshot/release-jjb-guppy-snapshot.yaml
deleted file mode 100644
index 6f6d54e5..00000000
--- a/jjb/release-jjb-guppy-snapshot/release-jjb-guppy-snapshot.yaml
+++ /dev/null
@@ -1,126 +0,0 @@
----
-- project:
-    name: release-jjb-guppy-snapshot
-    jobs:
-      - release-jjb-guppy-snapshot
-
-- job-template:
-    name: 'release-jjb-guppy-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/guppy_6.0.0
-          description: "refspec to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 6.0.0
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: guppy
-          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
-            - intel-corei7-64
-            - raspberrypi3
-            - dra7xx-evm
-            - m3ulcb-nogfx
-            - dragonboard-410c
-            # 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/guppy/**'
-
-    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
-      - shell:
-          !include-raw-escape: include-release-jjb-guppy-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-guppy.sh
-          - ../common/include-agl-lava-jobs-submit-only.sh
diff --git a/jjb/release-jjb-guppy-sources/include-release-jjb-release-sources-rsync.sh b/jjb/release-jjb-guppy-sources/include-release-jjb-release-sources-rsync.sh
deleted file mode 100644
index ceac3acd..00000000
--- a/jjb/release-jjb-guppy-sources/include-release-jjb-release-sources-rsync.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-#set -x
-set -e
-
-# construct upload folder
-
-
-BRANCH=${RELEASE_BRANCH}
-REVISION=${RELEASE_VERSION}
-
-
-rm -rf AGLRELEASE || true
-
-mkdir agl-${BRANCH}-${REVISION}
-pushd agl-${BRANCH}-${REVISION}
-
-repo init --reference=/opt/AGL/preclone -q -b ${GERRIT_BRANCH} -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo -m ${BRANCH}_${REVISION}.xml
-
-repo sync --force-sync
-
-repo manifest -r > ../${BRANCH}_${REVISION}.tar.xml
-
-rm -rf .repo
-find . -name *.git | xargs rm -rf
-
-ln -sf meta-agl/README-AGL.md
-
-cat <<EOF > aglsetup.sh
-#!/bin/bash
-
-source ./meta-agl/scripts/aglsetup.sh \$@
-EOF
-
-chmod a+x aglsetup.sh
-
-popd
-
-tar -cjvf agl-${BRANCH}-${REVISION}.tar.bz2 agl-${BRANCH}-${REVISION}
-
-md5sum agl-${BRANCH}-${REVISION}.tar.bz2 > agl-${BRANCH}-${REVISION}.tar.bz2.md5sum
-sha256sum agl-${BRANCH}-${REVISION}.tar.bz2 > agl-${BRANCH}-${REVISION}.tar.bz2.sha256sum
-
-
-
-rm -rf UPLOAD || true
-mkdir -p UPLOAD/
-
-cp -ar agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.* UPLOAD/
-
-export RSYNCSRC=$(pwd)/UPLOAD
-export RSYNCDST="/srv/download/AGL/release/${RELEASE_BRANCH}/"
-
-ls -alh UPLOAD/
-
-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}/* 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
diff --git a/jjb/release-jjb-guppy-sources/release-jjb-sources.yaml b/jjb/release-jjb-guppy-sources/release-jjb-sources.yaml
deleted file mode 100644
index 4e33fabc..00000000
--- a/jjb/release-jjb-guppy-sources/release-jjb-sources.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
-    name: release-jjb-guppy-sources
-    jobs:
-      - release-jjb-guppy-sources
-
-- job-template:
-    name: 'release-jjb-guppy-sources'
-    project-type: freestyle
-    concurrent: false
-    node: agl-test-slave
-
-    parameters:
-      - string:
-          name: GERRIT_BRANCH
-          default: guppy
-          description: "release version number for build"
-      - string:
-          name: RELEASE_VERSION
-          default: 7.0.0
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: guppy
-          description: "release branch to build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-release-sources-rsync.sh
diff --git a/jjb/release-jjb-halibut-release/include-release-jjb-release-move-sandbox.sh b/jjb/release-jjb-halibut-release/include-release-jjb-release-move-sandbox.sh
deleted file mode 100644
index 2f85a3ea..00000000
--- a/jjb/release-jjb-halibut-release/include-release-jjb-release-move-sandbox.sh
+++ /dev/null
@@ -1,27 +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
-
-
-export REMOTESRC="/srv/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"
-fi
-
-exit 0
\ No newline at end of file
diff --git a/jjb/release-jjb-halibut-release/release-jjb-release.yaml b/jjb/release-jjb-halibut-release/release-jjb-release.yaml
deleted file mode 100644
index bee34019..00000000
--- a/jjb/release-jjb-halibut-release/release-jjb-release.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-- project:
-    name: release-jjb-halibut-release-from-snapshot
-    jobs:
-      - release-jjb-halibut-release-from-snapshot
-
-- job-template:
-    name: 'release-jjb-halibut-release-from-snapshot'
-    project-type: freestyle
-    concurrent: false
-    node: control-slave
-
-    parameters:
-      - string:
-          name: GERRIT_BRANCH
-          default: halibut
-          description: "branch to build"
-      - string:
-          name: RELEASE_BRANCH
-          default: halibut
-          description: "release branch to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 8.0.0
-          description: "release version number for build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-release-move-sandbox.sh
-      - trigger-builds:
-        - project: "release-jjb-halibut-sources"
-          current-parameters: true
-          block: true
-          same-node: true
diff --git a/jjb/release-jjb-halibut-snapshot/include-release-jjb-halibut-snapshot-rsync.sh b/jjb/release-jjb-halibut-snapshot/include-release-jjb-halibut-snapshot-rsync.sh
deleted file mode 100644
index 9be7c6f8..00000000
--- a/jjb/release-jjb-halibut-snapshot/include-release-jjb-halibut-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-halibut-snapshot/release-jjb-halibut-snapshot.yaml b/jjb/release-jjb-halibut-snapshot/release-jjb-halibut-snapshot.yaml
deleted file mode 100644
index a655155e..00000000
--- a/jjb/release-jjb-halibut-snapshot/release-jjb-halibut-snapshot.yaml
+++ /dev/null
@@ -1,126 +0,0 @@
----
-- project:
-    name: release-jjb-halibut-snapshot
-    jobs:
-      - release-jjb-halibut-snapshot
-
-- job-template:
-    name: 'release-jjb-halibut-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/halibut_6.0.0
-          description: "refspec to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 6.0.0
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: halibut
-          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
-            - intel-corei7-64
-            - raspberrypi3
-            - dra7xx-evm
-            - m3ulcb-nogfx
-            - dragonboard-410c
-            # 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/halibut/**'
-
-    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
-      - shell:
-          !include-raw-escape: include-release-jjb-halibut-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-halibut.sh
-          - ../common/include-agl-lava-jobs-submit-only.sh
diff --git a/jjb/release-jjb-halibut-sources/include-release-jjb-release-sources-rsync.sh b/jjb/release-jjb-halibut-sources/include-release-jjb-release-sources-rsync.sh
deleted file mode 100644
index ceac3acd..00000000
--- a/jjb/release-jjb-halibut-sources/include-release-jjb-release-sources-rsync.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-#set -x
-set -e
-
-# construct upload folder
-
-
-BRANCH=${RELEASE_BRANCH}
-REVISION=${RELEASE_VERSION}
-
-
-rm -rf AGLRELEASE || true
-
-mkdir agl-${BRANCH}-${REVISION}
-pushd agl-${BRANCH}-${REVISION}
-
-repo init --reference=/opt/AGL/preclone -q -b ${GERRIT_BRANCH} -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo -m ${BRANCH}_${REVISION}.xml
-
-repo sync --force-sync
-
-repo manifest -r > ../${BRANCH}_${REVISION}.tar.xml
-
-rm -rf .repo
-find . -name *.git | xargs rm -rf
-
-ln -sf meta-agl/README-AGL.md
-
-cat <<EOF > aglsetup.sh
-#!/bin/bash
-
-source ./meta-agl/scripts/aglsetup.sh \$@
-EOF
-
-chmod a+x aglsetup.sh
-
-popd
-
-tar -cjvf agl-${BRANCH}-${REVISION}.tar.bz2 agl-${BRANCH}-${REVISION}
-
-md5sum agl-${BRANCH}-${REVISION}.tar.bz2 > agl-${BRANCH}-${REVISION}.tar.bz2.md5sum
-sha256sum agl-${BRANCH}-${REVISION}.tar.bz2 > agl-${BRANCH}-${REVISION}.tar.bz2.sha256sum
-
-
-
-rm -rf UPLOAD || true
-mkdir -p UPLOAD/
-
-cp -ar agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.* UPLOAD/
-
-export RSYNCSRC=$(pwd)/UPLOAD
-export RSYNCDST="/srv/download/AGL/release/${RELEASE_BRANCH}/"
-
-ls -alh UPLOAD/
-
-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}/* 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
diff --git a/jjb/release-jjb-halibut-sources/release-jjb-sources.yaml b/jjb/release-jjb-halibut-sources/release-jjb-sources.yaml
deleted file mode 100644
index c55d0db9..00000000
--- a/jjb/release-jjb-halibut-sources/release-jjb-sources.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
-    name: release-jjb-halibut-sources
-    jobs:
-      - release-jjb-halibut-sources
-
-- job-template:
-    name: 'release-jjb-halibut-sources'
-    project-type: freestyle
-    concurrent: false
-    node: agl-test-slave
-
-    parameters:
-      - string:
-          name: GERRIT_BRANCH
-          default: halibut
-          description: "release version number for build"
-      - string:
-          name: RELEASE_VERSION
-          default: 8.0.0
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: halibut
-          description: "release branch to build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-release-sources-rsync.sh
diff --git a/jjb/release-jjb-icefish-release/include-release-jjb-release-move-sandbox.sh b/jjb/release-jjb-icefish-release/include-release-jjb-release-move-sandbox.sh
deleted file mode 100644
index 2f85a3ea..00000000
--- a/jjb/release-jjb-icefish-release/include-release-jjb-release-move-sandbox.sh
+++ /dev/null
@@ -1,27 +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
-
-
-export REMOTESRC="/srv/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"
-fi
-
-exit 0
\ No newline at end of file
diff --git a/jjb/release-jjb-icefish-release/release-jjb-release.yaml b/jjb/release-jjb-icefish-release/release-jjb-release.yaml
deleted file mode 100644
index 1bb6db80..00000000
--- a/jjb/release-jjb-icefish-release/release-jjb-release.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-- project:
-    name: release-jjb-icefish-release-from-snapshot
-    jobs:
-      - release-jjb-icefish-release-from-snapshot
-
-- job-template:
-    name: 'release-jjb-icefish-release-from-snapshot'
-    project-type: freestyle
-    concurrent: false
-    node: control-slave
-
-    parameters:
-      - string:
-          name: GERRIT_BRANCH
-          default: icefish
-          description: "branch to build"
-      - string:
-          name: RELEASE_BRANCH
-          default: icefish
-          description: "release branch to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 9.0.0
-          description: "release version number for build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-release-move-sandbox.sh
-      - trigger-builds:
-        - project: "release-jjb-icefish-sources"
-          current-parameters: true
-          block: true
-          same-node: true
diff --git a/jjb/release-jjb-icefish-snapshot/include-release-jjb-icefish-snapshot-rsync.sh b/jjb/release-jjb-icefish-snapshot/include-release-jjb-icefish-snapshot-rsync.sh
deleted file mode 100644
index 9be7c6f8..00000000
--- a/jjb/release-jjb-icefish-snapshot/include-release-jjb-icefish-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-icefish-snapshot/release-jjb-icefish-snapshot.yaml b/jjb/release-jjb-icefish-snapshot/release-jjb-icefish-snapshot.yaml
deleted file mode 100644
index f05c0710..00000000
--- a/jjb/release-jjb-icefish-snapshot/release-jjb-icefish-snapshot.yaml
+++ /dev/null
@@ -1,132 +0,0 @@
----
-- project:
-    name: release-jjb-icefish-snapshot
-    jobs:
-      - release-jjb-icefish-snapshot
-
-- job-template:
-    name: 'release-jjb-icefish-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/icefish_8.99.1
-          description: "refspec to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 8.99.1
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: icefish
-          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
-            - intel-corei7-64
-            - raspberrypi3
-            - raspberrypi4
-            - m3ulcb-nogfx
-            - h3ulcb-nogfx
-            # 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/icefish/**'
-
-    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
-      - shell:
-          !include-raw-escape: include-release-jjb-icefish-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-icefish.sh
-          - ../common/include-agl-lava-jobs-submit-only.sh
-      - conditional-step:
-          condition-kind: always
-          steps:
-              - shell:
-                  !include-raw-escape:
-                  - ../common/include-agl-get-cost.sh
diff --git a/jjb/release-jjb-icefish-sources/include-release-jjb-release-sources-rsync.sh b/jjb/release-jjb-icefish-sources/include-release-jjb-release-sources-rsync.sh
deleted file mode 100644
index 64d27b2b..00000000
--- a/jjb/release-jjb-icefish-sources/include-release-jjb-release-sources-rsync.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-#set -x
-set -e
-
-
-mkdir -p ~/bin
-curl https://storage.googleapis.com/git-repo-downloads/repo-1 > ~/bin/repo
-chmod a+x ~/bin/repo
-export PATH=$PATH:~/bin/
-
-# construct upload folder
-
-
-BRANCH=${RELEASE_BRANCH}
-REVISION=${RELEASE_VERSION}
-
-
-rm -rf AGLRELEASE || true
-
-mkdir agl-${BRANCH}-${REVISION}
-pushd agl-${BRANCH}-${REVISION}
-
-repo init --reference=/opt/AGL/preclone -q -b ${GERRIT_BRANCH} -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo -m ${BRANCH}_${REVISION}.xml
-
-repo sync --force-sync
-
-repo manifest -r > ../${BRANCH}_${REVISION}.tar.xml
-
-rm -rf .repo
-find . -name *.git | xargs rm -rf
-
-ln -sf meta-agl/README-AGL.md
-
-cat <<EOF > aglsetup.sh
-#!/bin/bash
-
-source ./meta-agl/scripts/aglsetup.sh \$@
-EOF
-
-chmod a+x aglsetup.sh
-
-popd
-
-tar -cjvf agl-${BRANCH}-${REVISION}.tar.bz2 agl-${BRANCH}-${REVISION}
-
-md5sum agl-${BRANCH}-${REVISION}.tar.bz2 > agl-${BRANCH}-${REVISION}.tar.bz2.md5sum
-sha256sum agl-${BRANCH}-${REVISION}.tar.bz2 > agl-${BRANCH}-${REVISION}.tar.bz2.sha256sum
-
-
-
-rm -rf UPLOAD || true
-mkdir -p UPLOAD/
-
-cp -ar agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.* UPLOAD/
-
-export RSYNCSRC=$(pwd)/UPLOAD
-export RSYNCDST="/srv/download/AGL/release/${RELEASE_BRANCH}/"
-
-ls -alh UPLOAD/
-
-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}/* 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
diff --git a/jjb/release-jjb-icefish-sources/release-jjb-sources.yaml b/jjb/release-jjb-icefish-sources/release-jjb-sources.yaml
deleted file mode 100644
index 86328176..00000000
--- a/jjb/release-jjb-icefish-sources/release-jjb-sources.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
-    name: release-jjb-icefish-sources
-    jobs:
-      - release-jjb-icefish-sources
-
-- job-template:
-    name: 'release-jjb-icefish-sources'
-    project-type: freestyle
-    concurrent: false
-    node: agl-test-slave
-
-    parameters:
-      - string:
-          name: GERRIT_BRANCH
-          default: icefish
-          description: "release version number for build"
-      - string:
-          name: RELEASE_VERSION
-          default: 9.0.0
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: icefish
-          description: "release branch to build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-release-sources-rsync.sh
diff --git a/jjb/release-jjb-jellyfish-release/include-release-jjb-release-move-sandbox.sh b/jjb/release-jjb-jellyfish-release/include-release-jjb-release-move-sandbox.sh
deleted file mode 100644
index 2f85a3ea..00000000
--- a/jjb/release-jjb-jellyfish-release/include-release-jjb-release-move-sandbox.sh
+++ /dev/null
@@ -1,27 +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
-
-
-export REMOTESRC="/srv/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"
-fi
-
-exit 0
\ No newline at end of file
diff --git a/jjb/release-jjb-jellyfish-release/release-jjb-release.yaml b/jjb/release-jjb-jellyfish-release/release-jjb-release.yaml
deleted file mode 100644
index 6b0b994b..00000000
--- a/jjb/release-jjb-jellyfish-release/release-jjb-release.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-- project:
-    name: release-jjb-jellyfish-release-from-snapshot
-    jobs:
-      - release-jjb-jellyfish-release-from-snapshot
-
-- job-template:
-    name: 'release-jjb-jellyfish-release-from-snapshot'
-    project-type: freestyle
-    concurrent: false
-    node: agl-test-slave
-
-    parameters:
-      - string:
-          name: GERRIT_BRANCH
-          default: master
-          description: "branch to build"
-      - string:
-          name: RELEASE_BRANCH
-          default: jellyfish
-          description: "release branch to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 9.99.1
-          description: "release version number for build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-release-move-sandbox.sh
-      - trigger-builds:
-        - project: "release-jjb-jellyfish-sources"
-          current-parameters: true
-          block: true
-          same-node: true
diff --git a/jjb/release-jjb-jellyfish-snapshot/include-release-jjb-jellyfish-snapshot-rsync.sh b/jjb/release-jjb-jellyfish-snapshot/include-release-jjb-jellyfish-snapshot-rsync.sh
deleted file mode 100644
index 9be7c6f8..00000000
--- a/jjb/release-jjb-jellyfish-snapshot/include-release-jjb-jellyfish-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-jellyfish-snapshot/release-jjb-jellyfish-snapshot.yaml b/jjb/release-jjb-jellyfish-snapshot/release-jjb-jellyfish-snapshot.yaml
deleted file mode 100644
index e82716fb..00000000
--- a/jjb/release-jjb-jellyfish-snapshot/release-jjb-jellyfish-snapshot.yaml
+++ /dev/null
@@ -1,131 +0,0 @@
----
-- project:
-    name: release-jjb-jellyfish-snapshot
-    jobs:
-      - release-jjb-jellyfish-snapshot
-
-- job-template:
-    name: 'release-jjb-jellyfish-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/jellyfish_9.99.1
-          description: "refspec to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 9.99.1
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: jellyfish
-          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/jellyfish/**'
-
-    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
-      - shell:
-          !include-raw-escape: include-release-jjb-jellyfish-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-jellyfish.sh
-          - ../common/include-agl-lava-jobs-submit-only.sh
-      - conditional-step:
-          condition-kind: always
-          steps:
-              - shell:
-                  !include-raw-escape:
-                  - ../common/include-agl-get-cost.sh
diff --git a/jjb/release-jjb-jellyfish-sources/include-release-jjb-release-sources-rsync.sh b/jjb/release-jjb-jellyfish-sources/include-release-jjb-release-sources-rsync.sh
deleted file mode 100644
index 7dc96407..00000000
--- a/jjb/release-jjb-jellyfish-sources/include-release-jjb-release-sources-rsync.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-#set -x
-set -e
-
-mkdir -p ~/bin/ || true
-curl https://storage.googleapis.com/git-repo-downloads/repo-1 > ~/bin/repo
-chmod a+x ~/bin/repo
-export PATH=$PATH:~/bin/
-
-# construct upload folder
-
-
-BRANCH=${RELEASE_BRANCH}
-REVISION=${RELEASE_VERSION}
-
-
-rm -rf AGLRELEASE || true
-
-mkdir agl-${BRANCH}-${REVISION}
-pushd agl-${BRANCH}-${REVISION}
-
-repo init --reference=/opt/AGL/preclone -q -b ${GERRIT_BRANCH} -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo -m ${BRANCH}_${REVISION}.xml
-
-repo sync --force-sync
-
-repo manifest -r > ../${BRANCH}_${REVISION}.tar.xml
-
-rm -rf .repo
-find . -name *.git | xargs rm -rf
-
-ln -sf meta-agl/README-AGL.md
-
-cat <<EOF > aglsetup.sh
-#!/bin/bash
-
-source ./meta-agl/scripts/aglsetup.sh \$@
-EOF
-
-chmod a+x aglsetup.sh
-
-popd
-
-tar -cjvf agl-${BRANCH}-${REVISION}.tar.bz2 agl-${BRANCH}-${REVISION}
-
-md5sum agl-${BRANCH}-${REVISION}.tar.bz2 > agl-${BRANCH}-${REVISION}.tar.bz2.md5sum
-sha256sum agl-${BRANCH}-${REVISION}.tar.bz2 > agl-${BRANCH}-${REVISION}.tar.bz2.sha256sum
-
-
-
-rm -rf UPLOAD || true
-mkdir -p UPLOAD/
-
-cp -ar agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.* UPLOAD/
-
-export RSYNCSRC=$(pwd)/UPLOAD
-export RSYNCDST="/srv/download/AGL/release/${RELEASE_BRANCH}/"
-
-ls -alh UPLOAD/
-
-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}/* 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
diff --git a/jjb/release-jjb-jellyfish-sources/release-jjb-sources.yaml b/jjb/release-jjb-jellyfish-sources/release-jjb-sources.yaml
deleted file mode 100644
index a9292d86..00000000
--- a/jjb/release-jjb-jellyfish-sources/release-jjb-sources.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
-    name: release-jjb-jellyfish-sources
-    jobs:
-      - release-jjb-jellyfish-sources
-
-- job-template:
-    name: 'release-jjb-jellyfish-sources'
-    project-type: freestyle
-    concurrent: false
-    node: agl-test-slave
-
-    parameters:
-      - string:
-          name: GERRIT_BRANCH
-          default: master
-          description: "release version number for build"
-      - string:
-          name: RELEASE_VERSION
-          default: 9.99.1
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: jellyfish
-          description: "release branch to build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-release-sources-rsync.sh
diff --git a/jjb/release-jjb-koi-release/include-release-jjb-release-move-sandbox.sh b/jjb/release-jjb-koi-release/include-release-jjb-release-move-sandbox.sh
deleted file mode 100644
index 2f85a3ea..00000000
--- a/jjb/release-jjb-koi-release/include-release-jjb-release-move-sandbox.sh
+++ /dev/null
@@ -1,27 +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
-
-
-export REMOTESRC="/srv/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"
-fi
-
-exit 0
\ No newline at end of file
diff --git a/jjb/release-jjb-koi-release/release-jjb-release.yaml b/jjb/release-jjb-koi-release/release-jjb-release.yaml
deleted file mode 100644
index c21a36bd..00000000
--- a/jjb/release-jjb-koi-release/release-jjb-release.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
----
-- project:
-    name: release-jjb-koi-release-from-snapshot
-    jobs:
-      - release-jjb-koi-release-from-snapshot
-
-- job-template:
-    name: 'release-jjb-koi-release-from-snapshot'
-    project-type: freestyle
-    concurrent: false
-    node: agl-test-slave
-
-    parameters:
-      - string:
-          name: GERRIT_BRANCH
-          default: koi
-          description: "branch to build"
-      - string:
-          name: RELEASE_BRANCH
-          default: koi
-          description: "release branch to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 11.0.0
-          description: "release version number for build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-release-move-sandbox.sh
-      - trigger-builds:
-        - project: "release-jjb-koi-sources"
-          current-parameters: true
-          block: true
diff --git a/jjb/release-jjb-koi-snapshot/include-release-jjb-koi-snapshot-rsync.sh b/jjb/release-jjb-koi-snapshot/include-release-jjb-koi-snapshot-rsync.sh
deleted file mode 100644
index 9be7c6f8..00000000
--- a/jjb/release-jjb-koi-snapshot/include-release-jjb-koi-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-koi-snapshot/release-jjb-koi-snapshot.yaml b/jjb/release-jjb-koi-snapshot/release-jjb-koi-snapshot.yaml
deleted file mode 100644
index 2c3d75ac..00000000
--- a/jjb/release-jjb-koi-snapshot/release-jjb-koi-snapshot.yaml
+++ /dev/null
@@ -1,126 +0,0 @@
----
-- project:
-    name: release-jjb-koi-snapshot
-    jobs:
-      - release-jjb-koi-snapshot
-
-- job-template:
-    name: 'release-jjb-koi-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: koi
-          description: "branch to build"
-      - string:
-          name: GERRIT_REFSPEC
-          default: refs/tags/koi_11.0.0
-          description: "refspec to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 11.0.0
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: koi
-          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/koi/**'
-
-    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-koi-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-koi.sh
-          - ../common/include-agl-lava-jobs-submit-only.sh
diff --git a/jjb/release-jjb-koi-sources/include-release-jjb-release-sources-rsync.sh b/jjb/release-jjb-koi-sources/include-release-jjb-release-sources-rsync.sh
deleted file mode 100644
index 1d742e55..00000000
--- a/jjb/release-jjb-koi-sources/include-release-jjb-release-sources-rsync.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-#set -x
-set -e
-
-mkdir -p ~/bin/ || true
-curl https://storage.googleapis.com/git-repo-downloads/repo-1 > ~/bin/repo
-chmod a+x ~/bin/repo
-export PATH=$PATH:~/bin/
-
-# construct upload folder
-
-
-BRANCH=${RELEASE_BRANCH}
-REVISION=${RELEASE_VERSION}
-
-
-rm -rf AGLRELEASE || true
-rm -rf agl-${BRANCH}-${REVISION} || true
-
-mkdir agl-${BRANCH}-${REVISION}
-pushd agl-${BRANCH}-${REVISION}
-
-repo init --repo-branch=repo-1  --reference=/opt/AGL/preclone -q -b ${GERRIT_BRANCH} -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo -m ${BRANCH}_${REVISION}.xml
-
-repo sync --force-sync
-
-repo manifest -r > ../${BRANCH}_${REVISION}.tar.xml
-
-rm -rf .repo
-find . -name *.git | xargs rm -rf
-
-ln -sf meta-agl/README-AGL.md
-
-cat <<EOF > aglsetup.sh
-#!/bin/bash
-
-source ./meta-agl/scripts/aglsetup.sh \$@
-EOF
-
-chmod a+x aglsetup.sh
-
-popd
-
-tar -cjvf agl-${BRANCH}-${REVISION}.tar.bz2 agl-${BRANCH}-${REVISION}
-
-md5sum agl-${BRANCH}-${REVISION}.tar.bz2 > agl-${BRANCH}-${REVISION}.tar.bz2.md5sum
-sha256sum agl-${BRANCH}-${REVISION}.tar.bz2 > agl-${BRANCH}-${REVISION}.tar.bz2.sha256sum
-
-
-
-rm -rf UPLOAD || true
-mkdir -p UPLOAD/
-
-cp -ar agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.* UPLOAD/
-
-export RSYNCSRC=$(pwd)/UPLOAD
-export RSYNCDST="/srv/download/AGL/release/${RELEASE_BRANCH}/"
-
-ls -alh UPLOAD/
-
-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}/* 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
diff --git a/jjb/release-jjb-koi-sources/release-jjb-sources.yaml b/jjb/release-jjb-koi-sources/release-jjb-sources.yaml
deleted file mode 100644
index 7c1de307..00000000
--- a/jjb/release-jjb-koi-sources/release-jjb-sources.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
-    name: release-jjb-koi-sources
-    jobs:
-      - release-jjb-koi-sources
-
-- job-template:
-    name: 'release-jjb-koi-sources'
-    project-type: freestyle
-    concurrent: false
-    node: agl-test-slave
-
-    parameters:
-      - string:
-          name: GERRIT_BRANCH
-          default: koi
-          description: "release version number for build"
-      - string:
-          name: RELEASE_VERSION
-          default: 11.0.0
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: koi
-          description: "release branch to build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-release-sources-rsync.sh
diff --git a/jjb/release-jjb-lamprey-release/include-release-jjb-release-move-sandbox.sh b/jjb/release-jjb-lamprey-release/include-release-jjb-release-move-sandbox.sh
deleted file mode 100644
index 2f85a3ea..00000000
--- a/jjb/release-jjb-lamprey-release/include-release-jjb-release-move-sandbox.sh
+++ /dev/null
@@ -1,27 +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
-
-
-export REMOTESRC="/srv/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"
-fi
-
-exit 0
\ No newline at end of file
diff --git a/jjb/release-jjb-lamprey-release/release-jjb-release.yaml b/jjb/release-jjb-lamprey-release/release-jjb-release.yaml
deleted file mode 100644
index c9695ade..00000000
--- a/jjb/release-jjb-lamprey-release/release-jjb-release.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-- project:
-    name: release-jjb-lamprey-release-from-snapshot
-    jobs:
-      - release-jjb-lamprey-release-from-snapshot
-
-- job-template:
-    name: 'release-jjb-lamprey-release-from-snapshot'
-    project-type: freestyle
-    concurrent: false
-    node: agl-test-slave
-
-    parameters:
-      - string:
-          name: GERRIT_BRANCH
-          default: master
-          description: "branch to build"
-      - string:
-          name: RELEASE_BRANCH
-          default: lamprey
-          description: "release branch to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 11.91.0
-          description: "release version number for build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-release-move-sandbox.sh
-      - trigger-builds:
-        - project: "release-jjb-lamprey-sources"
-          current-parameters: true
-          block: true
-
diff --git a/jjb/release-jjb-lamprey-snapshot/bitbake-html5-image-qemux86-64.sh b/jjb/release-jjb-lamprey-snapshot/bitbake-html5-image-qemux86-64.sh
deleted file mode 100644
index 78af7470..00000000
--- a/jjb/release-jjb-lamprey-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-lamprey-snapshot/include-release-jjb-lamprey-snapshot-rsync.sh b/jjb/release-jjb-lamprey-snapshot/include-release-jjb-lamprey-snapshot-rsync.sh
deleted file mode 100644
index 9be7c6f8..00000000
--- a/jjb/release-jjb-lamprey-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-lamprey-snapshot/release-jjb-lamprey-snapshot.yaml b/jjb/release-jjb-lamprey-snapshot/release-jjb-lamprey-snapshot.yaml
deleted file mode 100644
index 9a60b66c..00000000
--- a/jjb/release-jjb-lamprey-snapshot/release-jjb-lamprey-snapshot.yaml
+++ /dev/null
@@ -1,126 +0,0 @@
----
-- project:
-    name: release-jjb-lamprey-snapshot
-    jobs:
-      - release-jjb-lamprey-snapshot
-
-- job-template:
-    name: 'release-jjb-lamprey-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/lamprey_11.91.0
-          description: "refspec to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 11.91.0
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: lamprey
-          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/lamprey/**'
-
-    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-lamprey-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-lamprey.sh
-          - ../common/include-agl-lava-jobs-submit-only.sh
diff --git a/jjb/release-jjb-marlin-release/include-release-jjb-release-move-sandbox.sh b/jjb/release-jjb-marlin-release/include-release-jjb-release-move-sandbox.sh
deleted file mode 100644
index 2f85a3ea..00000000
--- a/jjb/release-jjb-marlin-release/include-release-jjb-release-move-sandbox.sh
+++ /dev/null
@@ -1,27 +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
-
-
-export REMOTESRC="/srv/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"
-fi
-
-exit 0
\ No newline at end of file
diff --git a/jjb/release-jjb-marlin-release/release-jjb-release.yaml b/jjb/release-jjb-marlin-release/release-jjb-release.yaml
deleted file mode 100644
index 63252f53..00000000
--- a/jjb/release-jjb-marlin-release/release-jjb-release.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-- project:
-    name: release-jjb-marlin-release-from-snapshot
-    jobs:
-      - release-jjb-marlin-release-from-snapshot
-
-- job-template:
-    name: 'release-jjb-marlin-release-from-snapshot'
-    project-type: freestyle
-    concurrent: false
-    node: agl-test-slave
-
-    parameters:
-      - string:
-          name: GERRIT_BRANCH
-          default: master
-          description: "branch to build"
-      - string:
-          name: RELEASE_BRANCH
-          default: marlin
-          description: "release branch to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 12.91.0
-          description: "release version number for build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-release-move-sandbox.sh
-      - trigger-builds:
-        - project: "release-jjb-marlin-sources"
-          current-parameters: true
-          block: true
-
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
diff --git a/jjb/release-jjb-marlin-sources/include-release-jjb-release-sources-rsync.sh b/jjb/release-jjb-marlin-sources/include-release-jjb-release-sources-rsync.sh
deleted file mode 100644
index b0947b8b..00000000
--- a/jjb/release-jjb-marlin-sources/include-release-jjb-release-sources-rsync.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-#set -x
-set -e
-
-mkdir -p ~/bin/ || true
-curl https://storage.googleapis.com/git-repo-downloads/repo-1 > ~/bin/repo
-chmod a+x ~/bin/repo
-export PATH=$PATH:~/bin/
-
-# construct upload folder
-
-
-BRANCH=${RELEASE_BRANCH}
-REVISION=${RELEASE_VERSION}
-
-
-rm -rf AGLRELEASE || true
-
-mkdir agl-${BRANCH}-${REVISION}
-pushd agl-${BRANCH}-${REVISION}
-
-repo init  --repo-branch=repo-1 --reference=/opt/AGL/preclone -q -b ${GERRIT_BRANCH} -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo -m ${BRANCH}_${REVISION}.xml
-
-repo sync --force-sync
-
-repo manifest -r > ../${BRANCH}_${REVISION}.tar.xml
-
-rm -rf .repo
-find . -name *.git | xargs rm -rf
-
-ln -sf meta-agl/README-AGL.md
-
-cat <<EOF > aglsetup.sh
-#!/bin/bash
-
-source ./meta-agl/scripts/aglsetup.sh \$@
-EOF
-
-chmod a+x aglsetup.sh
-
-popd
-
-tar -cjvf agl-${BRANCH}-${REVISION}.tar.bz2 agl-${BRANCH}-${REVISION}
-
-md5sum agl-${BRANCH}-${REVISION}.tar.bz2 > agl-${BRANCH}-${REVISION}.tar.bz2.md5sum
-sha256sum agl-${BRANCH}-${REVISION}.tar.bz2 > agl-${BRANCH}-${REVISION}.tar.bz2.sha256sum
-
-
-
-rm -rf UPLOAD || true
-mkdir -p UPLOAD/
-
-cp -ar agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.* UPLOAD/
-
-export RSYNCSRC=$(pwd)/UPLOAD
-export RSYNCDST="/srv/download/AGL/release/${RELEASE_BRANCH}/"
-
-ls -alh UPLOAD/
-
-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}/* 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
diff --git a/jjb/release-jjb-marlin-sources/release-jjb-sources.yaml b/jjb/release-jjb-marlin-sources/release-jjb-sources.yaml
deleted file mode 100644
index 896a56ef..00000000
--- a/jjb/release-jjb-marlin-sources/release-jjb-sources.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
-    name: release-jjb-marlin-sources
-    jobs:
-      - release-jjb-marlin-sources
-
-- job-template:
-    name: 'release-jjb-marlin-sources'
-    project-type: freestyle
-    concurrent: false
-    node: agl-test-slave
-
-    parameters:
-      - string:
-          name: GERRIT_BRANCH
-          default: master
-          description: "release version number for 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?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-release-sources-rsync.sh
diff --git a/jjb/release-jjb-needlefish-release/include-release-jjb-release-move-sandbox.sh b/jjb/release-jjb-needlefish-release/include-release-jjb-release-move-sandbox.sh
deleted file mode 100644
index 2f85a3ea..00000000
--- a/jjb/release-jjb-needlefish-release/include-release-jjb-release-move-sandbox.sh
+++ /dev/null
@@ -1,27 +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
-
-
-export REMOTESRC="/srv/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"
-fi
-
-exit 0
\ No newline at end of file
diff --git a/jjb/release-jjb-needlefish-release/release-jjb-release.yaml b/jjb/release-jjb-needlefish-release/release-jjb-release.yaml
deleted file mode 100644
index f604d003..00000000
--- a/jjb/release-jjb-needlefish-release/release-jjb-release.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-- project:
-    name: release-jjb-needlefish-release-from-snapshot
-    jobs:
-      - release-jjb-needlefish-release-from-snapshot
-
-- job-template:
-    name: 'release-jjb-needlefish-release-from-snapshot'
-    project-type: freestyle
-    concurrent: false
-    node: agl-test-slave
-
-    parameters:
-      - string:
-          name: GERRIT_BRANCH
-          default: master
-          description: "branch to build"
-      - string:
-          name: RELEASE_BRANCH
-          default: needlefish
-          description: "release branch to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 13.91.0
-          description: "release version number for build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-release-move-sandbox.sh
-      - trigger-builds:
-        - project: "release-jjb-needlefish-sources"
-          current-parameters: true
-          block: true
-
diff --git a/jjb/release-jjb-needlefish-snapshot/bitbake-html5-image-qemux86-64.sh b/jjb/release-jjb-needlefish-snapshot/bitbake-html5-image-qemux86-64.sh
deleted file mode 100644
index 78af7470..00000000
--- a/jjb/release-jjb-needlefish-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-needlefish-snapshot/include-release-jjb-needlefish-snapshot-rsync.sh b/jjb/release-jjb-needlefish-snapshot/include-release-jjb-needlefish-snapshot-rsync.sh
deleted file mode 100644
index 9be7c6f8..00000000
--- a/jjb/release-jjb-needlefish-snapshot/include-release-jjb-needlefish-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-needlefish-snapshot/release-jjb-needlefish-snapshot.yaml b/jjb/release-jjb-needlefish-snapshot/release-jjb-needlefish-snapshot.yaml
deleted file mode 100644
index 6d0be905..00000000
--- a/jjb/release-jjb-needlefish-snapshot/release-jjb-needlefish-snapshot.yaml
+++ /dev/null
@@ -1,126 +0,0 @@
----
-- project:
-    name: release-jjb-needlefish-snapshot
-    jobs:
-      - release-jjb-needlefish-snapshot
-
-- job-template:
-    name: 'release-jjb-needlefish-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/needlefish_13.91.0
-          description: "refspec to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 13.91.0
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: needlefish
-          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/needlefish/**'
-
-    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-needlefish-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-needlefish.sh
-          - ../common/include-agl-lava-jobs-submit-only.sh
diff --git a/jjb/release-jjb-needlefish-sources/include-release-jjb-release-sources-rsync.sh b/jjb/release-jjb-needlefish-sources/include-release-jjb-release-sources-rsync.sh
deleted file mode 100644
index b0947b8b..00000000
--- a/jjb/release-jjb-needlefish-sources/include-release-jjb-release-sources-rsync.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-#set -x
-set -e
-
-mkdir -p ~/bin/ || true
-curl https://storage.googleapis.com/git-repo-downloads/repo-1 > ~/bin/repo
-chmod a+x ~/bin/repo
-export PATH=$PATH:~/bin/
-
-# construct upload folder
-
-
-BRANCH=${RELEASE_BRANCH}
-REVISION=${RELEASE_VERSION}
-
-
-rm -rf AGLRELEASE || true
-
-mkdir agl-${BRANCH}-${REVISION}
-pushd agl-${BRANCH}-${REVISION}
-
-repo init  --repo-branch=repo-1 --reference=/opt/AGL/preclone -q -b ${GERRIT_BRANCH} -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo -m ${BRANCH}_${REVISION}.xml
-
-repo sync --force-sync
-
-repo manifest -r > ../${BRANCH}_${REVISION}.tar.xml
-
-rm -rf .repo
-find . -name *.git | xargs rm -rf
-
-ln -sf meta-agl/README-AGL.md
-
-cat <<EOF > aglsetup.sh
-#!/bin/bash
-
-source ./meta-agl/scripts/aglsetup.sh \$@
-EOF
-
-chmod a+x aglsetup.sh
-
-popd
-
-tar -cjvf agl-${BRANCH}-${REVISION}.tar.bz2 agl-${BRANCH}-${REVISION}
-
-md5sum agl-${BRANCH}-${REVISION}.tar.bz2 > agl-${BRANCH}-${REVISION}.tar.bz2.md5sum
-sha256sum agl-${BRANCH}-${REVISION}.tar.bz2 > agl-${BRANCH}-${REVISION}.tar.bz2.sha256sum
-
-
-
-rm -rf UPLOAD || true
-mkdir -p UPLOAD/
-
-cp -ar agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.* UPLOAD/
-
-export RSYNCSRC=$(pwd)/UPLOAD
-export RSYNCDST="/srv/download/AGL/release/${RELEASE_BRANCH}/"
-
-ls -alh UPLOAD/
-
-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}/* 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
diff --git a/jjb/release-jjb-needlefish-sources/release-jjb-sources.yaml b/jjb/release-jjb-needlefish-sources/release-jjb-sources.yaml
deleted file mode 100644
index ac41822d..00000000
--- a/jjb/release-jjb-needlefish-sources/release-jjb-sources.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
-    name: release-jjb-needlefish-sources
-    jobs:
-      - release-jjb-needlefish-sources
-
-- job-template:
-    name: 'release-jjb-needlefish-sources'
-    project-type: freestyle
-    concurrent: false
-    node: agl-test-slave
-
-    parameters:
-      - string:
-          name: GERRIT_BRANCH
-          default: master
-          description: "release version number for build"
-      - string:
-          name: RELEASE_VERSION
-          default: 13.91.0
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: needlefish
-          description: "release branch to build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-release-sources-rsync.sh
diff --git a/jjb/release-jjb-octopus-release/include-release-jjb-release-move-sandbox.sh b/jjb/release-jjb-octopus-release/include-release-jjb-release-move-sandbox.sh
deleted file mode 100644
index 2f85a3ea..00000000
--- a/jjb/release-jjb-octopus-release/include-release-jjb-release-move-sandbox.sh
+++ /dev/null
@@ -1,27 +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
-
-
-export REMOTESRC="/srv/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"
-fi
-
-exit 0
\ No newline at end of file
diff --git a/jjb/release-jjb-octopus-release/release-jjb-release.yaml b/jjb/release-jjb-octopus-release/release-jjb-release.yaml
deleted file mode 100644
index a8b2fda1..00000000
--- a/jjb/release-jjb-octopus-release/release-jjb-release.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-- project:
-    name: release-jjb-octopus-release-from-snapshot
-    jobs:
-      - release-jjb-octopus-release-from-snapshot
-
-- job-template:
-    name: 'release-jjb-octopus-release-from-snapshot'
-    project-type: freestyle
-    concurrent: false
-    node: agl-test-slave
-
-    parameters:
-      - string:
-          name: GERRIT_BRANCH
-          default: master
-          description: "branch to build"
-      - string:
-          name: RELEASE_BRANCH
-          default: octopus
-          description: "release branch to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 14.92.0
-          description: "release version number for build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-release-move-sandbox.sh
-      - trigger-builds:
-        - project: "release-jjb-octopus-sources"
-          current-parameters: true
-          block: true
-
diff --git a/jjb/release-jjb-octopus-snapshot/bitbake-html5-image-qemux86-64.sh b/jjb/release-jjb-octopus-snapshot/bitbake-html5-image-qemux86-64.sh
deleted file mode 100644
index 78af7470..00000000
--- a/jjb/release-jjb-octopus-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-octopus-snapshot/include-release-jjb-octopus-snapshot-rsync.sh b/jjb/release-jjb-octopus-snapshot/include-release-jjb-octopus-snapshot-rsync.sh
deleted file mode 100644
index 9be7c6f8..00000000
--- a/jjb/release-jjb-octopus-snapshot/include-release-jjb-octopus-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-octopus-snapshot/release-jjb-octopus-snapshot.yaml b/jjb/release-jjb-octopus-snapshot/release-jjb-octopus-snapshot.yaml
deleted file mode 100644
index 0573618b..00000000
--- a/jjb/release-jjb-octopus-snapshot/release-jjb-octopus-snapshot.yaml
+++ /dev/null
@@ -1,126 +0,0 @@
----
-- project:
-    name: release-jjb-octopus-snapshot
-    jobs:
-      - release-jjb-octopus-snapshot
-
-- job-template:
-    name: 'release-jjb-octopus-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/octopus_14.92.0
-          description: "refspec to build"
-      - string:
-          name: RELEASE_VERSION
-          default: 14.92.0
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: octopus
-          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/octopus/**'
-
-    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-octopus-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-octopus.sh
-          - ../common/include-agl-lava-jobs-submit-only.sh
diff --git a/jjb/release-jjb-octopus-sources/include-release-jjb-release-sources-rsync.sh b/jjb/release-jjb-octopus-sources/include-release-jjb-release-sources-rsync.sh
deleted file mode 100644
index b0947b8b..00000000
--- a/jjb/release-jjb-octopus-sources/include-release-jjb-release-sources-rsync.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-#set -x
-set -e
-
-mkdir -p ~/bin/ || true
-curl https://storage.googleapis.com/git-repo-downloads/repo-1 > ~/bin/repo
-chmod a+x ~/bin/repo
-export PATH=$PATH:~/bin/
-
-# construct upload folder
-
-
-BRANCH=${RELEASE_BRANCH}
-REVISION=${RELEASE_VERSION}
-
-
-rm -rf AGLRELEASE || true
-
-mkdir agl-${BRANCH}-${REVISION}
-pushd agl-${BRANCH}-${REVISION}
-
-repo init  --repo-branch=repo-1 --reference=/opt/AGL/preclone -q -b ${GERRIT_BRANCH} -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo -m ${BRANCH}_${REVISION}.xml
-
-repo sync --force-sync
-
-repo manifest -r > ../${BRANCH}_${REVISION}.tar.xml
-
-rm -rf .repo
-find . -name *.git | xargs rm -rf
-
-ln -sf meta-agl/README-AGL.md
-
-cat <<EOF > aglsetup.sh
-#!/bin/bash
-
-source ./meta-agl/scripts/aglsetup.sh \$@
-EOF
-
-chmod a+x aglsetup.sh
-
-popd
-
-tar -cjvf agl-${BRANCH}-${REVISION}.tar.bz2 agl-${BRANCH}-${REVISION}
-
-md5sum agl-${BRANCH}-${REVISION}.tar.bz2 > agl-${BRANCH}-${REVISION}.tar.bz2.md5sum
-sha256sum agl-${BRANCH}-${REVISION}.tar.bz2 > agl-${BRANCH}-${REVISION}.tar.bz2.sha256sum
-
-
-
-rm -rf UPLOAD || true
-mkdir -p UPLOAD/
-
-cp -ar agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.* UPLOAD/
-
-export RSYNCSRC=$(pwd)/UPLOAD
-export RSYNCDST="/srv/download/AGL/release/${RELEASE_BRANCH}/"
-
-ls -alh UPLOAD/
-
-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}/* 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
diff --git a/jjb/release-jjb-octopus-sources/release-jjb-sources.yaml b/jjb/release-jjb-octopus-sources/release-jjb-sources.yaml
deleted file mode 100644
index dc2d4628..00000000
--- a/jjb/release-jjb-octopus-sources/release-jjb-sources.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
-    name: release-jjb-octopus-sources
-    jobs:
-      - release-jjb-octopus-sources
-
-- job-template:
-    name: 'release-jjb-octopus-sources'
-    project-type: freestyle
-    concurrent: false
-    node: agl-test-slave
-
-    parameters:
-      - string:
-          name: GERRIT_BRANCH
-          default: master
-          description: "release version number for build"
-      - string:
-          name: RELEASE_VERSION
-          default: 14.92.0
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: octopus
-          description: "release branch to build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-release-sources-rsync.sh
diff --git a/jjb/release-jjb-pike-release/include-release-jjb-release-move-sandbox.sh b/jjb/release-jjb-pike-release/include-release-jjb-release-move-sandbox.sh
deleted file mode 100644
index 2f85a3ea..00000000
--- a/jjb/release-jjb-pike-release/include-release-jjb-release-move-sandbox.sh
+++ /dev/null
@@ -1,27 +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
-
-
-export REMOTESRC="/srv/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"
-fi
-
-exit 0
\ No newline at end of file
diff --git a/jjb/release-jjb-pike-snapshot/bitbake-html5-image-qemux86-64.sh b/jjb/release-jjb-pike-snapshot/bitbake-html5-image-qemux86-64.sh
deleted file mode 100644
index 78af7470..00000000
--- a/jjb/release-jjb-pike-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-pike-snapshot/include-release-jjb-pike-snapshot-rsync.sh b/jjb/release-jjb-pike-snapshot/include-release-jjb-pike-snapshot-rsync.sh
deleted file mode 100644
index 9be7c6f8..00000000
--- a/jjb/release-jjb-pike-snapshot/include-release-jjb-pike-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-pike-sources/include-release-jjb-release-sources-rsync.sh b/jjb/release-jjb-pike-sources/include-release-jjb-release-sources-rsync.sh
deleted file mode 100644
index b0947b8b..00000000
--- a/jjb/release-jjb-pike-sources/include-release-jjb-release-sources-rsync.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-#set -x
-set -e
-
-mkdir -p ~/bin/ || true
-curl https://storage.googleapis.com/git-repo-downloads/repo-1 > ~/bin/repo
-chmod a+x ~/bin/repo
-export PATH=$PATH:~/bin/
-
-# construct upload folder
-
-
-BRANCH=${RELEASE_BRANCH}
-REVISION=${RELEASE_VERSION}
-
-
-rm -rf AGLRELEASE || true
-
-mkdir agl-${BRANCH}-${REVISION}
-pushd agl-${BRANCH}-${REVISION}
-
-repo init  --repo-branch=repo-1 --reference=/opt/AGL/preclone -q -b ${GERRIT_BRANCH} -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo -m ${BRANCH}_${REVISION}.xml
-
-repo sync --force-sync
-
-repo manifest -r > ../${BRANCH}_${REVISION}.tar.xml
-
-rm -rf .repo
-find . -name *.git | xargs rm -rf
-
-ln -sf meta-agl/README-AGL.md
-
-cat <<EOF > aglsetup.sh
-#!/bin/bash
-
-source ./meta-agl/scripts/aglsetup.sh \$@
-EOF
-
-chmod a+x aglsetup.sh
-
-popd
-
-tar -cjvf agl-${BRANCH}-${REVISION}.tar.bz2 agl-${BRANCH}-${REVISION}
-
-md5sum agl-${BRANCH}-${REVISION}.tar.bz2 > agl-${BRANCH}-${REVISION}.tar.bz2.md5sum
-sha256sum agl-${BRANCH}-${REVISION}.tar.bz2 > agl-${BRANCH}-${REVISION}.tar.bz2.sha256sum
-
-
-
-rm -rf UPLOAD || true
-mkdir -p UPLOAD/
-
-cp -ar agl-${RELEASE_BRANCH}-${RELEASE_VERSION}.* UPLOAD/
-
-export RSYNCSRC=$(pwd)/UPLOAD
-export RSYNCDST="/srv/download/AGL/release/${RELEASE_BRANCH}/"
-
-ls -alh UPLOAD/
-
-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}/* 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
diff --git a/jjb/release-jjb-pike-sources/release-jjb-sources.yaml b/jjb/release-jjb-pike-sources/release-jjb-sources.yaml
deleted file mode 100644
index f426df49..00000000
--- a/jjb/release-jjb-pike-sources/release-jjb-sources.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
-    name: release-jjb-pike-sources
-    jobs:
-      - release-jjb-pike-sources
-
-- job-template:
-    name: 'release-jjb-pike-sources'
-    project-type: freestyle
-    concurrent: false
-    node: agl-test-slave
-
-    parameters:
-      - string:
-          name: GERRIT_BRANCH
-          default: master
-          description: "release version number for build"
-      - string:
-          name: RELEASE_VERSION
-          default: 15.92.0
-          description: "release version number for build"
-      - string:
-          name: RELEASE_BRANCH
-          default: pike
-          description: "release branch to build"
-      - string:
-          name: UPLOAD
-          default: yes_or_no
-          description: "Upload?"
-
-    build-discarder:
-      days-to-keep: 30
-      num-to-keep: 40
-      artifact-days-to-keep: -1
-      artifact-num-to-keep: 5
-
-    wrappers:
-      - agl-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell:
-          !include-raw-escape:
-          - include-release-jjb-release-sources-rsync.sh
diff --git a/jjb/release-jjb-flounder-release/include-release-jjb-release-move-sandbox.sh b/jjb/release-jjb-quillback-release/include-release-jjb-release-move-sandbox.sh
index 2f85a3ea..2f85a3ea 100644
--- a/jjb/release-jjb-flounder-release/include-release-jjb-release-move-sandbox.sh
+++ b/jjb/release-jjb-quillback-release/include-release-jjb-release-move-sandbox.sh
diff --git a/jjb/release-jjb-pike-release/release-jjb-release.yaml b/jjb/release-jjb-quillback-release/release-jjb-release.yaml
index 29c43e42..074d868e 100644
--- a/jjb/release-jjb-pike-release/release-jjb-release.yaml
+++ b/jjb/release-jjb-quillback-release/release-jjb-release.yaml
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: release-jjb-pike-release-from-snapshot
+    name: release-jjb-quillback-release-from-snapshot
     jobs:
-      - release-jjb-pike-release-from-snapshot
+      - release-jjb-quillback-release-from-snapshot
 
 - job-template:
-    name: 'release-jjb-pike-release-from-snapshot'
+    name: 'release-jjb-quillback-release-from-snapshot'
     project-type: freestyle
     concurrent: false
     node: agl-test-slave
@@ -17,7 +17,7 @@
           description: "branch to build"
       - string:
           name: RELEASE_BRANCH
-          default: pike
+          default: quillback
           description: "release branch to build"
       - string:
           name: RELEASE_VERSION
@@ -43,7 +43,7 @@
           !include-raw-escape:
           - include-release-jjb-release-move-sandbox.sh
       - trigger-builds:
-        - project: "release-jjb-pike-sources"
+        - project: "release-jjb-quillback-sources"
           current-parameters: true
           block: true
 
diff --git a/jjb/release-jjb-koi-snapshot/bitbake-html5-image-qemux86-64.sh b/jjb/release-jjb-quillback-snapshot/bitbake-html5-image-qemux86-64.sh
index 78af7470..78af7470 100644
--- a/jjb/release-jjb-koi-snapshot/bitbake-html5-image-qemux86-64.sh
+++ b/jjb/release-jjb-quillback-snapshot/bitbake-html5-image-qemux86-64.sh
diff --git a/jjb/release-jjb-eel-snapshot/include-release-jjb-eel-snapshot-rsync.sh b/jjb/release-jjb-quillback-snapshot/include-release-jjb-snapshot-rsync.sh
index 9be7c6f8..9be7c6f8 100644
--- a/jjb/release-jjb-eel-snapshot/include-release-jjb-eel-snapshot-rsync.sh
+++ b/jjb/release-jjb-quillback-snapshot/include-release-jjb-snapshot-rsync.sh
diff --git a/jjb/release-jjb-pike-snapshot/release-jjb-pike-snapshot.yaml b/jjb/release-jjb-quillback-snapshot/release-jjb-snapshot.yaml
index dec44a09..9b298cd9 100644
--- a/jjb/release-jjb-pike-snapshot/release-jjb-pike-snapshot.yaml
+++ b/jjb/release-jjb-quillback-snapshot/release-jjb-snapshot.yaml
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: release-jjb-pike-snapshot
+    name: release-jjb-quillback-snapshot
     jobs:
-      - release-jjb-pike-snapshot
+      - release-jjb-quillback-snapshot
 
 - job-template:
-    name: 'release-jjb-pike-snapshot'
+    name: 'release-jjb-quillback-snapshot'
     project-type: matrix
     concurrent: false
     node: control-slave
@@ -21,15 +21,15 @@
           description: "branch to build"
       - string:
           name: GERRIT_REFSPEC
-          default: refs/tags/pike_15.92.0
+          default: refs/tags/quillback_17.0.0
           description: "refspec to build"
       - string:
           name: RELEASE_VERSION
-          default: 15.92.0
+          default: 17.0.0
           description: "release version number for build"
       - string:
           name: RELEASE_BRANCH
-          default: pike
+          default: quillback
           description: "release branch to build"
       - string:
           name: UPLOAD
@@ -71,7 +71,7 @@
     triggers:
       - gerrit-trigger-patch-submitted-silent:
           name: 'AGL/AGL-repo'
-          branch: 'regs/tags/pike/**'
+          branch: 'regs/tags/quillback/**'
 
     wrappers:
       - agl-infra-wrappers:
@@ -106,21 +106,20 @@
           - ../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-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-pike-snapshot-rsync.sh
+          !include-raw-escape: include-release-jjb-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-pike.sh
+          - ../common/include-agl-run-test-short-releaseit.sh
           - ../common/include-agl-lava-jobs-submit-only.sh
diff --git a/jjb/release-jjb-lamprey-sources/include-release-jjb-release-sources-rsync.sh b/jjb/release-jjb-quillback-sources/include-release-jjb-release-sources-rsync.sh
index b0947b8b..b0947b8b 100644
--- a/jjb/release-jjb-lamprey-sources/include-release-jjb-release-sources-rsync.sh
+++ b/jjb/release-jjb-quillback-sources/include-release-jjb-release-sources-rsync.sh
diff --git a/jjb/release-jjb-lamprey-sources/release-jjb-sources.yaml b/jjb/release-jjb-quillback-sources/release-jjb-sources.yaml
index c0c663ed..24622e74 100644
--- a/jjb/release-jjb-lamprey-sources/release-jjb-sources.yaml
+++ b/jjb/release-jjb-quillback-sources/release-jjb-sources.yaml
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: release-jjb-lamprey-sources
+    name: release-jjb-quillback-sources
     jobs:
-      - release-jjb-lamprey-sources
+      - release-jjb-quillback-sources
 
 - job-template:
-    name: 'release-jjb-lamprey-sources'
+    name: 'release-jjb-quillback-sources'
     project-type: freestyle
     concurrent: false
     node: agl-test-slave
@@ -17,11 +17,11 @@
           description: "release version number for build"
       - string:
           name: RELEASE_VERSION
-          default: 11.91.0
+          default: 17.0.0
           description: "release version number for build"
       - string:
           name: RELEASE_BRANCH
-          default: lamprey
+          default: quillback
           description: "release branch to build"
       - string:
           name: UPLOAD